title: eGit checkout conflict - can't reset
body: <p>I have 2 branches: master &amp; develop. I have been developing in "develop" and committed everything I need. What was left (application generated file: .out) I didn't care for! So when I went to switch branch, I got prompted  following:</p>
  
  <p><img src="https://i.stack.imgur.com/1mIWN.png" alt="enter image description here"> </p>
  
  <p>I clicked "Reset" however instead of switching to the branch I got prompted the same "Checkout Conflicts" windows with exactly the same choices. I clicked "Reset" again, however above process just repeated. I clicked a while -- no help the same happens again and again. More over I encountered the same scenario on different eclipses (Juno, Kepler) and different OS (Mac &amp; Windows).</p>
  
  <p>Am I doing something wrong? I don't want to commit or stash the file, I just want it to be reset. Is it a bug? Or there is a solution?</p>
  
  <p>Thank you.</p>