title: git merge into master removing changes from branch
body: <p>I'll attempt to be as clear as I can, though I'm not sure how I got into this situation and all attempts to re-create it have failed.</p>
  
  <p>I've been working on a branch, iss454, for several months now. During that time, I did make a couple attempts to keep it up-to-date by merging master into iss454 (this all went fine). I finally finished my changes and was ready to push them all into master. However, when I do this, I lose code from iss454 that I need, and I can't figure out why the merge is wiping those lines.</p>
  
  <p>I've tried merging both ways, master to iss454 as well as iss454 into master (well, a clone of master). I've tried cherry picking last commit of iss454 into master. I've tried rebasing in both directions. I also tried doing a git merge -s ours master, which seemed to work, but then I was missing a ton of other changes. No matter what I've tried so far, not all of my changes from iss454 are making it over. </p>
  
  <p>I've never had this trouble before, so I'm sure I did something along the way that threw me off, but as I said, I can't figure out what. </p>
  
  <p>Any thoughts on how to get my code merged in completely? I really don't want to have to manually fix this.</p>