SVN FAQs (ii)

Source: Internet
Author: User

1. Branch different ==> update merge (SVN auto merge)
2. Branch conflict ==> Resolve conflicts, select a correct version overlay (latest correct direct revert up-to-date):
There are four files. The yellow exclamation point indicates that SVN has no way to automatically merge because a B modifies the same content.
First file: Co-modified content comparison display. The second file: A your code for the third file: A B To modify the previous version code of the fourth file: B code
Workaround: 1. A and B discuss which version to choose. Just get that version back.
Recovery method: For example A is correct, the second file is renamed to the file name of a, overwrite.
If you want to revert to the previous version of a B, overwrite it with a third file
If you want to revert to B, it will be overwritten with the fourth file, or right-click on the first file, revert to the version of B on the server now.

SVN FAQs (ii)

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: 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.