title: Commit changes missing from git merge
body: <p>I have two branches, A) develop and B) feature</p>
  
  <p>I work on B, and am now ready to merge B into A.  A has obviously had a lot of work done, with a lot of other feature branches merging in via pull requests.  I pull the latest head of A and for testing purposes, let's say I merge A in to B (Note, I get the same behavior going both directions, but I'm trying to figure out where the problem is).</p>
  
  <p>I merged A in to B, but I have a lot of compiler errors after resolving the merge conflicts.  I noticed that there is actually code included in A that is just not making it over to B.  This causes the build to fail, and there are many things missing (it's at least one large commit worth of code).  </p>
  
  <p>I tracked down the commit that I'm having issues "merging" from A to B.  It's not that it's not merging though, I do see it when I type "git log" when B is checked out after the merge. For some reason the actual changes associated with the commit just disappear.  There are no merge conflicts regarding the code in question, and I'm certain I never touched that section while working on B so that anything else could happen.</p>
  
  <p>Regarding the "missing" commit (even though I see it in the branches log), what am I supposed to do to recover the actual changes?  I would use a diff tool, but I'm worried this is a symptom of a larger problem and that other code that I'm unaware of could also be missing.</p>
  
  <p>I'm fairly new to git, so I'm a little unsure of how to approach this.  Please let me know if there's any other information that could be useful.</p>
  
  <p><strong>What I've tried so far:</strong></p>
  
  <p>Merging A in to B, commit is there but code from commit is not
  Merging B to A, same issue with same code/commit</p>
  
  <p>I've tried rebasing, but the branches are off by many commits with many conflicts.  All commits are also on the server so from what I've read this may be a bad idea.  Please let me know if I should try rebasing in some direction (A->B or B->A).</p>