How can I get rid of Eclipse Git “conflict” icons after all merges are resolved?
问题 I get the Git conflict icon in Eclipse on lots of files, even though it seems that I resolved any possible conflicts. In Eclipse 4.5.2, in the Project view, I select a project root and do right-click -> Compare to branch origin/master . Next, we see the Team Synchronization view. Many files show a red conflict icon., but they should not. 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