All kinds of symbols in svn meaning arrows

Source: Internet
Author: User

Yellow exclamation point (with conflict):
-This is a conflict, the conflict is that you have modified a file, others have modified the file, others to commit before you submit, then you will be prompted to submit the conflict, not allow you to submit, to prevent your submission to cover the other people's changes. To resolve the conflict, if you confirm that your changes are invalid, then use TSVN to restore your changes, if you think your changes are correct, the other person's submission is invalid, then use TSVN first labeled "Resolve Conflict", then you can submit; If you think your changes and other people's changes are part of the effective , you can manually merge other people's changes into your changes and then use TSVN to label "resolve conflicts" and then submit them. Go to the folder and look for a Yellow Exclamation-point file, these files are where the conflict occurs and the conflict is handled according to the actual situation
m font size (with local modification code):
-This is to indicate that you have uncommitted local code.
Hello (newly added resources):
-This indicates that the file is a new file resource in the project, and the new resources can be files, pictures, code, etc.
Red exclamation marks(Local code does not conform to the library):
-This means that the local code is not consistent with the library, and if the user wants to fix it, they can delete the red exclamation mark icon file and update it directly.
Gray Rightwards Arrow (locally modified)
--Local code is not on the library in time.
Blue left arrow (modified on SVN)
--Remember to update the code after the change, before submitting to the SVN comparison habits.
Gray right and with a plus arrow in the middle(Local more files than SVN)
--remember to be consistent with SVN after the change.
Blue left and a plus arrow in the middle(Files that are more than Local on SVN)
--After deleting the file, update it again and update all the files on SVN.
Gray right with a minus arrow in the Middle(deleted locally, but not deleted files on SVN)
--that is to say you delete the confirmation, be sure to remember the library, Keep it consistent with svn
Blue left with a minus arrow in the middle (svn deleted, Files that are not deleted locally)
--the code on the SVN library, determining that it needs to be deleted, update svn (remove useless code).
red two-way arrow /span>

-This means that both local and SVN have been modified, preferably by merging local modifications to SVN, and updating the code before modifying it.

All kinds of symbols in svn meaning arrows

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.