title: Git Merge Overwriting My Local Branch File Without Signalling Merge Conflict
body: <p>I have a situation today where Git merge did not work properly for one file. This is what I did:</p>
  
  <ol>
  <li>I have a local branch which I did my work on</li>
  <li>Then master branch was updated with some other dude's work</li>
  <li>I do git checkout master and then git pull (to pull down all this changes into my local master branch)</li>
  <li>I then switch back to my local branch and do git pull origin master to pull down all master branch changes into my local branch.</li>
  <li>Out of the say 15 files, a few were merge conflicts. But one file where there is a merge conflict difference between master and my local branch was not registered as a merge conflict. Git just overwrote my local branch version of the file with the latest version from master branch.</li>
  </ol>
  
  <p>did i do something wrong or is this a bug in git?</p>