git conflict

https://wiki.52north.org/bin/view/Documentation/ResolveMergeConflictsInGitEclipse

 

Note that you can also solve directly a merge conflict from Eclipse/Egit itself:
See "Egit: Solving Merge Conflicts":

You can manually edit the text on the left side or use the Copy current change from right to left button to copy the conflicting changes from right to left.

Next step is from the context menu of the file, to select Team -> Add to index. Than commit.