title: Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue
body: <p>I've started Eclipse EGit. In some scenarios it is really not comprehensive.</p>
  
  <p>I have local file e.g. pom.xml changed. On git server this file was changed. 
  I do <code>pull</code>, EGIt says: </p>
  
  <blockquote>
    <p>Checkout conflict with files: </p>
  </blockquote>
  
  <p>i.e. pulling stops (<code>fetch</code> is done, but not <code>merge</code>), that is OK. However the next is bad experience.</p>
  
  <p>I synchronize workspace, put my changes aside and make it the same as FETCH_HEAD. But EGit doesn't want to continue. I replace the file with HEAD revision. But EGit still doesn't want to continue.</p>
  
  <p><strong>What standard expected user operation should be with EGit after conflict resolution?</strong></p>
  
  <p>UPDATE:</p>
  
  <p>I <code>added to index</code>, then <code>marked as Merged</code> -> <code>pull</code> still can't pass.<br>
  When I select <code>Merge</code> I get the dialog</p>
  
  <p><img src="https://i.stack.imgur.com/U700c.png" alt="enter image description here"></p>
  
  <p>I can't commit the file as it is not in list of changed files.</p>