title: git pull doesn't bring all the changes
body: <p>This question has been asked many times and I have tried solution provided there but no luck for me. So ...</p>
  
  <p>I have master and test_branch</p>
  
  <pre><code>Admin@paul MINGW64 ~/my-project (master)
  $ git diff master test_branch
  </code></pre>
  
  <p>it shows 5 files and so many commits. 
  But when I do:</p>
  
  <pre><code>Admin@paul MINGW64 ~/my-project (master)
  $ git pull origin test_branch
  
  From https://bitbucket.org/clientname/my_project
   * branch            test_branch -&gt; FETCH_HEAD
  Auto-merging page/test1.java
  CONFLICT (content): Merge conflict in page/test1.java
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I fix the conflicts , run tests and get failure because pull didn't bring all the changes and for file test1.java only 1 or 2 lines of conflict not all.</p>
  
  <p>I tried <code>gitk</code> too but that shows very complex web kind of structure which is hard to understand.</p>