How the conflict occurs 2 users modify the same source file, a user submits the code first, and then the B user submits the code, this time there is a conflict.
How to resolve conflicts after 4 files conflict, the B user has 4 files on this side (one is the source file itself + 3 additional source files) 1. The source file itself means that the file can be submitted after resolving the conflict.
This file contains the local file, plus the code that you modified, plus the code that someone else modified. In addition, there are less than, equal sign, greater than the number of content:
<<<<<<<< MIMEB User-Modified code =============a user-Modified code >>>>>>>>r latest version
Note: The code between the less than and equal signs is the code that is modified by the current user; The code between the equals sign and the greater than sign is the code that someone else modified.
2.3 Additional source files means that these 3 files will automatically disappear after resolving a conflict.
a.mime file (local file, plus modified code)
B.R Version (local file, not including modified code-in fact, the latest version of the previous version of the source file)
C.R Version (the latest version, which is consistent with the files on the SVN server)
Edit conflict Right-click on the source file itself--edit conflict, open the File Comparison window, the window will appear MIME file + R latest version of the file. 1) Click the button: Copy the non-conflicting content to the mime file. 2) Click the button to copy the conflicting content to the mime file. 3) Save the changes.
Resolve Conflicts 3. Right-click the source file itself--to resolve the conflict. The purpose is to inform SVN that the conflict has been resolved. This time you will find that 3 additional source files have disappeared.
Submit 4. Right-click the source file itself--"submit.
Copyright NOTICE: This article for Bo Master original article, without Bo Master permission not reproduced.
svn resolves conflicts
