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

Paul Verest picture Paul Verest · Aug 5, 2013 · Viewed 109.5k times · Source

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 pull, EGIt says:

Checkout conflict with files:

i.e. pulling stops (fetch is done, but not merge), that is OK. However the next is bad experience.

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.

What standard expected user operation should be with EGit after conflict resolution?

UPDATE:

I added to index, then marked as Merged -> pull still can't pass.
When I select Merge I get the dialog

enter image description here

I can't commit the file as it is not in list of changed files.

Answer

Jojo.Lechelt picture Jojo.Lechelt · Mar 27, 2014

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