title: How can I get rid of Eclipse Git "conflict" icons after all merges are resolved?
body: <p>I get the Git conflict icon in Eclipse  on lots of files, even though it seems that I resolved any possible conflicts.</p>
  
  <p>In Eclipse 4.5.2, in the Project view, I select a project root and do right-click -> Compare to branch <em>origin/master</em>. Next, we see the Team Synchronization view. Many files show a red conflict icon.<a href="https://i.stack.imgur.com/lDMGs.png" rel="noreferrer"><img src="https://i.stack.imgur.com/lDMGs.png" alt="conflict icon"></a>, but they should not.</p>
  
  <p>The Git staging view, which is supposed to show conflicts, is empty. I already tried Merge; Committing the merge (nothing remains to be committed). I tried Add to Index from the Git Staging view; and even Overwrite from the Team Synchronization view. Comparing the local and origin files shows that they are identical.</p>
  
  <p>Git setting <em>autocrlf</em> is <em>true</em>, so that is not the issue.</p>
  
  <p>This occurs repeatedly.</p>
  
  <p>Why do I see this conflict icon? How can I get rid of it?</p>
  
  <p><a href="https://i.stack.imgur.com/4ipGT.png" rel="noreferrer"><img src="https://i.stack.imgur.com/4ipGT.png" alt="Staging"></a></p>