Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue

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

Related Posts:

  1. How do I set up Eclipse/EGit with GitHub?
  2. How to merge branch to master?
  3. The following untracked working tree files would be overwritten by merge, but I don’t care
  4. The following untracked working tree files would be overwritten by merge, but I don’t care
  5. merge one local branch into another local branch
  6. What is the difference between `git merge` and `git merge –no-ff`?
  7. The following untracked working tree files would be overwritten by merge, but I don’t care
  8. ‘cannot open git-upload-pack’ error in Eclipse when cloning or pushing git repository
  9. Updates were rejected because the remote contains work that you do not have locally
  10. How to resolve git status “Unmerged paths:”?
  11. How do you merge two Git repositories?
  12. Git merge reports “Already up-to-date” though there is a difference
  13. How to merge a specific commit in Git
  14. How do I delete a Git branch locally and remotely?
  15. What is git tag, How to create tags & How to checkout git remote tag(s)
  16. Difference between “git add -A” and “git add .”
  17. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  18. What is the best (and safest) way to merge a Git branch into master?
  19. How can I switch to another branch in git?
  20. Squash my last X commits together using Git
  21. How to apply a patch generated with git format-patch?
  22. Abort a Git Merge
  23. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  24. How to delete a remote tag?
  25. Updates were rejected because the tip of your current branch is behind its remote counterpart
  26. Updates were rejected because the tip of your current branch is behind its remote counterpart
  27. git stash apply version
  28. Git fetch remote branch
  29. Updating a local repository with changes from a GitHub repository
  30. What does “Changes not staged for commit” mean
  31. git: fatal: Could not read from remote repository
  32. How do I update Homebrew?
  33. Git error when trying to push — pre-receive hook declined
  34. How can I merge multiple commits onto another branch as a single squashed commit?
  35. Gitignore not working
  36. Could not open a connection to your authentication agent
  37. How to get just one file from another branch?
  38. git checkout a single file from another branch and put in different folder
  39. Update Git branches from master
  40. Stash only one file out of multiple files that have changed with Git?
  41. How to find my GitHub username so that I can be found via the URL?
  42. Create a branch in Git from another branch
  43. Create Git branch with current changes
  44. github website publish cannot publish unborn HEAD
  45. What is HEAD in Git?
  46. What are the differences between git remote prune, git prune, git fetch –prune, etc
  47. How to get the current branch name in Git?
  48. How can I git stash a specific file?
  49. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  50. How to name and retrieve a stash by name in git?
  51. Stash just a single file
  52. Stash just a single file
  53. Git – Ignore node_modules folder everywhere
  54. How do I provide a username and password when running “git clone [email protected]”?
  55. How to undo ‘git reset’?
  56. fatal: Not a valid object name: ‘master’
  57. Git and nasty “error: cannot lock existing info/refs fatal”
  58. How do I delete a local repository in git?
  59. Throw away local commits in Git
  60. Hard reset of a single file
  61. How to remove remote origin from a Git repository
  62. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  63. Is there a “theirs” version of “git merge -s ours”?
  64. How do I copy a version of a single file from one Git branch to another?
  65. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  66. Eclipse “Error: Could not find or load main class”
  67. Heroku: How to change a Git remote on Heroku
  68. Invalid VCS root mapping – 3 errors on my project
  69. Undoing a ‘git push’
  70. What’s the significance of the “No newline at end of file” log?
  71. What is the difference between pull and clone in git?
  72. How do I clone a single branch in Git?
  73. how to reset develop branch to master
  74. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  75. Git’s local repository and remote repository — confusing concepts
  76. Repository size limits for GitHub.com
  77. How do i git push specific branch?
  78. fatal: could not read Username for ‘https://github.com’: No such file or directory
  79. git push origin master does not work
  80. How can I see which Git branches are tracking which remote / upstream branch?
  81. Git clone verbose output?
  82. TortoiseGit-git did not exit cleanly (exit code 1)
  83. How to `git pull` while ignoring local changes?
  84. Uninitialize git repository
  85. How to create a local branch from an existing remote branch?
  86. Git says “Automatic merge failed”, what does it mean?
  87. How do I clone a subdirectory only of a Git repository?
  88. What is the .git folder?
  89. How to stop tracking and ignore changes to a file in Git?
  90. Git Push Error: insufficient permission for adding an object to repository database
  91. Git push requires username and password
  92. WordPress with Git
  93. WordPress Git Workflow Help
  94. WordPress and Git – What folders should I track?
  95. Multiple copies of the same website: how to organize code/architecture?
  96. Pull latest stable release via git [closed]
  97. Why do the Roots theme CSS files not load (404)?
  98. Painless way to track remote Git repo for WordPress updates
  99. WordPress on git – need help with configuration
  100. What’s is the best stack for cPanel continuous deployment?

Leave a Comment