title: git go back to the state of a file before conflict
body: <p>I had the merge conflict while pulling from another branch and used "Use mine" instead of "Use theirs" mistakenly for a single file. the other conflicted files were taken good care. </p>
  
  <p>Now i want to move to the old state of this file (before conflict) and pull again from the branch to create the conflict and select the right option.</p>
  
  <p>I have used checkout <em>git checkout "commit#" PathToFile</em> which rightly retrieves the file to the state it was in (before the conflict), but now when i pull from other branch the conflict is not there.</p>