title: Different results with git merge and git rebase
body: <p>I am working on feature branches and need to take the latest code from the development branch into the feature branch.</p>
  
  <p>Earlier I used to do it via <code>git merge</code> but that creates additional merge commits. So I have started using <code>git rebase</code> from source tree.</p>
  
  <p>My understanding is that merge and rebase should cause similar conflicts. But in actual, when I do a merge , the conflicts shown are normal in the way they should be with the content of feature branch proper.</p>
  
  <p>But in case of a rebase, the conflicts are totally different and some code which is not even in the feature branch is shown up as conflicts. If I resolve conflicts this way, it will actually make my file inconsistent. I have tried this multiple times and every time rebase creates conflicts which are not in line with the actual feature branch. Am I missing something conceptually?</p>