Svn various color states

Yellow exclamation mark ( There are conflicts ):
-- There is a conflict , Conflict means that you have made changes to a file , Others have also modified this document , Someone else submitted it before you submitted it , When you submit again, you will be prompted to have a conflict , You are not allowed to submit , Prevent your submission from covering other people's changes . To resolve the conflict , If you confirm that your changes are invalid , Then use TSVN Just restore your changes ; If you think your changes are correct , Someone else's submission is invalid , Then use TSVN First mark it with “ Resolve conflicts ”, Then you can submit ; If you think that part of your changes and others' changes are effective , Then you can manually incorporate other people's changes into your changes , And then use TSVN Tagged as “ Resolve conflicts ”, Then you can submit . Enter folder , Look for files with yellow exclamation marks , These documents are where the conflict happened , Deal with the conflict according to the actual situation
Rice brand ( There are local Modification codes )：
-- This means that you have uncommitted local code .
Say hello to you. ( New resources ):
-- This indicates that the file is a new file resource in the project , New resources can be files 、 picture 、 Code etc. .
Red exclamation mark ( The local code is not consistent with the library )：
-- This shows that the local code is not consistent with the library , If the user wants to fix it , You can delete the red exclamation mark icon file , direct update that will do .
Gray right arrow ( It's been modified locally )
-- The local code is not in the library in time .
Blue arrow to the left (SVN It's been modified on the Internet )
-- Remember to update the code and modify it , Submit with svn Contrast habits .
The gray arrow to the right with a plus sign in the middle ( Local than SVN The extra files on the Internet )
-- When you're done, remember to follow svn bring into correspondence with
The blue arrow to the left with a plus sign in the middle (SVN More files on the Internet than local )
-- After deleting the file , Update again , take svn Update all the documents on this page .
The gray arrow to the right with a minus sign in the middle ( Local deleted , and SVN Undeleted files on )
-- That is to say, after you delete and confirm , Be sure to go to the library , Follow svn bring into correspondence with
Blue arrow to the left with a minus sign in the middle (SVN It's deleted from , And locally undeleted files )
-- comparison svn Code on the library , After confirming the need to delete , to update svn( Delete useless code ).
Red two-way arrow (SVN It's been modified on the Internet , Locally modified files )
-- This means local and svn It's been revised on the Internet , It's best to merge local changes into svn, Last update before modifying the code .
--------------------- 
author ：niu_hao 
source ：CSDN 
original text ：https://blog.csdn.net/niu_hao/article/details/6774471 
Copyright notice ： This article is an original blog article , Please attach a link to the blog post ！