Svn identifier

Source: Internet
Author: User

Yellow exclamation point (conflict ):
-- This is a conflict, that is, you have modified a file, and others have modified the file. Others have submitted the file before you submit it, if you submit the file again, you will be prompted for a conflict. You are not allowed to submit the file to prevent your submission from overwriting others' modifications. To resolve the conflict, if you confirm that your modification is invalid, use TSVN to restore your modification. If you think that your modification is correct, if others' submissions are invalid, use TSVN to mark them as "resolving conflicts" first, and then you can submit them; if you believe that some of your modifications and others are valid, you can manually merge others' modifications into your modifications, use TSVN to mark it as "resolution conflict", and then submit it. Go to the folder and find the files with a yellow exclamation mark. These files are the conflicting places. Handle the conflict according to the actual situation.
Rice font size (with local code modification ):
-- This indicates that you have unsubmitted local code.
Hello (new resource ):
-- This indicates that the file is a new file resource in the project, and the new resource can be a file, image, code, etc.
Red exclamation mark (the local code is not consistent with the library ):
-- This indicates that the local code is not consistent with that on the database. If you want to fix it, you can delete the file with the red exclamation mark and update it directly.
Gray to right arrow (locally modified)
-- The local code is not uploaded to the database in time.
Blue to left arrow (SVN modified)
-- Remember to modify the updated code and compare it with svn before submission.
Gray-to-right arrow with a plus sign in the middle (Local files more than SVN)
-- Remember to make the changes consistent with svn.
Blue arrow with a plus sign in the left and middle (SVN has more files than local)
-- After deleting the file, update it again and update all the files on svn.
The gray-to-right arrow with a minus sign in the middle (deleted locally but not deleted on SVN)
-- That is to say, after you confirm the deletion, you must remember to upload the database, which is consistent with svn.
There is a minus arrow in the blue to the left (SVN deleted, but local files not deleted)
-- Compare the code on the svn Database. After confirming that the code needs to be deleted, update svn (delete useless code ).
Red two-way arrow (SVN files modified and locally modified)
-- This indicates that both the local and svn have been modified. It is best to merge the local modifications to svn, and update the code before modification.

Svn identifier

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.