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

1. After closing the Conflict Error Dialog; from the Project Explorer, right click on the head of the project -> Team -> Stashes -> Stash Changes
2. Enter a name for your stash. E.G. "Conflict"
3. Try Pulling again. Hopefully there are no errors this time.
4. From the Git Repository view, expand your repository -> Stashed Commits
5. Right Click on the stash you created in step 2 -> Apply Stashed Changes
6. This brings up the merge tool if it can't automatically merge it.
7. Manually resolve the merge conflicts in the file/s.
8. Right Click on the file editor -> Team -> Add To Index
9. If you are not ready to commit the file or just don't want it in the Index, right click on the file editor -> Team -> Remove from Index.
10. Cleanup: From the Git Repository view, right Click on the stash you created in step 2 -> Delete Stashed Commit

Your local working directory file should be be merged