git resolves conflicts in eclipse

--reprint: http://blog.csdn.net/rosten/article/details/17068285

1, the Project->team-> synchronization:

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

3. Use the merge Tool to perform the second

Use the head merge effect:

4, and then manually modify

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

5, the conflict file changed to change the icon style, and then submitted to the local, this time the submission is merge merge:

6, at this time need to pull down arrow and the number is gone, notice the change of the icon:

7, can now push directly to the remote:

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