Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

Question

I\'ve started Eclipse EGit. In some scenarios it is really not comprehensive.

I have local file e.g. pom.xml changed. On git server this file was changed. I do pu

Answer 1

Situation:

• You have local uncommitted changes
• You pull from the master repo
• You get the error "Checkout conflict with files: xy"

Solution:

• Stage and commit (at least) the files xy
• Pull again
• If automerge is possible, everything is ok.
• If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>)
  • Manually edit the conflicting files
• Commit and push