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

I guess the best way to do this is like this :

1. Store all your changes in a separate branch.
2. Then do a hard reset on the local master.
3. Then merge back your changes from the locally created branch
4. Then commit and push your changes.

That how I resolve mine, whenever it happens.