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

Source: Internet
Author: User
Tags commit

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.





















Related Article

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.