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

The proper solution is the one provided by @Jojo.Lechelt.

However if you don't want to commit for any reason and still want to pull the changes,you may save your changes somewhere else,replace the conflicting file with HEAD revision and then pull.

Later you can paste your changes again and compare it with HEAD and incorporate other people changes into your file.