I modified a file here, but did not upload it with git, and then my friends modified the same file and uploaded it. Then I got a Checkout conflict with files: error when pulling in eclipse. After consulting the relevant information, I got a solution , Reproduced records:
1.Team—>Synchronize Workspace
2. Find the conflict file in the synchronization window and copy it out of your local modification
3. Right-click on the file and select Overwrite -----> Yes,
4. Right-click on the conflict file and select mark as merged
5. Then merge the copied self-modified content with the current content
6. Switch back to the Package Explorer interface and pull again. Success!
