eclipse:git resolves conflicts that occur when the same location is modified with the file.

Cause: Two commits have modified the same location, Git does not know which one will prevail, and therefore gives the decision to the individual.

WORKAROUND: Project Right-click------------->team------------->synchronize Workplace--------------> Find conflict file-------------> Right-click------------->add to git index------------->commit Local

------------->pull-------------> Second add to git index--------------> conflict file Right-click Commit-------------> Choose what you want to keep---> Conflict Resolution at this point is the same as the non-conflicting commit process.

Note:<<<<<<< head below is your local code ======= below is the code that conflicts with you, in the end to keep that copy, decide for yourself.