git resolve conflicts in eclipse

1. Project->Team->Sync:

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

 3. Use the Merge Tool to execute the second item

The combined effect of using HEAD:

 

4, and then manually modify

 4. The modified file needs to be added to the Git  index:

 5. The conflict file is changed to the modified icon style, and then submitted to the local. The submission at this time is the merge merge:

 6. At this time, the down arrow and the number of pulls are gone, pay attention to the change of the icon:

 7. Now you can push directly to the remote:

 

   At this point, configure->save and push executes the conflict step by step and the conflict is resolved.