Use pull error in eclipse (git commit conflict)

1, Engineering->team->pull: error

Solution:

2, engineering->team->syschronize Workspace:

3. The conflicting code is listed on the left side; (Optional: Click on the right mouse button to select the Merge Tool)

4, on the right you can click the local code in the right mouse button directly with remote code to overwrite the native code;

can also be a place of their own changes;

5, modified, on the left of the Conflict code list click on the mouse message, ADD to Git Index

6, then pull again.

Use pull error in eclipse (git commit conflict)