title: Git: How to recover a file after a pull / failed auto merge?
body: <p>I was about to get the latest with a <code>git pull origin master</code> and realized I have conflicts in some config files. But I also have other files to checkin, which I dont want to loose.</p>
  
  <p>Since these conflicts are local config files, I simply deleted them, hoping to retrieve them again by doing a new pull request. </p>
  
  <p>Now trying to do another <code>git pull origin master</code> and it says </p>
  
  <blockquote>
    <p>"Pull is not possible because you have unmerged files. please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution, or use 'git commit -a'."</p>
  </blockquote>
  
  <p>So how can I recover these deleted config files with the latest state from the repository? (I didn't care about my local changes to these files, hence I deleted it)</p>
  
  <p>Shall I now do for each config file:</p>
  
  <p><code>git checkout -- path/to/individual_file</code></p>
  
  <p>Thanks,</p>