Error using pull in eclipse (git commit conflict)

1. Project->Team->pull: error

solution:

2、工程->Team->Syschronize Workspace：

3. The conflicting codes will be listed on the left; (optional operation: right-click on it and select Merge Tool)

4. On the right side, you can click the right mouse button in the local code to directly overwrite the local code with the remote code;

　　You can also modify it one by one;

5. After the modification, click the mouse on the conflicting code list on the left, Add to Git Index

6. Then pull again.