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

In Eclipse :-

1. Right click -> click on 'add to index'

Add conflict file in staged area

2. Right Click ->click on commit

Add conflict file in local repository

3. Pull

You will get all changes (change in remote repository and local repository)

Changes mentioned as Head(<<<<<< HEAD) is your change, Changes mentioned in branch(>>>>>>> branch) is other person change, you can update file accordingly.

4. Right click ->click on add to index

5. Right click -> commit and push