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

Right click on the project and select [replace with] -> Head Revision .Now select pull changes in current branch or pull changes from upstream.