git resolves conflicts in eclipse

Excerpt from http://blog.csdn.net/rosten/article/details/17068285

1. Engineering->team-> Synchronization

2. From remote pull to local, the following will appear

3. Using the merge Tool, perform the second

Effects after using the head merge

4. Manually modify it again

5. The modified file needs to be added to git index:

6. Conflict file changed to change icon style, then submit to local, this time the submission is merge merge:

7. The downward arrow and number of pull is required at this time, notice the change of the icon

8. You can now push directly to the remote:

At this point configure->save and push step-by-step conflict is done.

git resolves conflicts in eclipse