SVN FAQs (ii)

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)