Yellow exclamation mark (conflicting):
-- This is a conflict. The conflict means that you have modified a certain file, and others have also modified the file. Others submit before you submit, and then you will be prompted to submit a conflict. , and does not allow you to commit, preventing your commit from overwriting someone else's changes. To resolve conflicts, if you confirm that your changes are invalid, use TSVN to restore your changes; if you think your changes are correct and other people's submissions are invalid, then use TSVN to mark "conflict resolution" first , and then you can submit it; if you think your revisions and others' revisions are partly valid, then you manually merge other people's revisions into your revisions, and then use TSVN to mark "conflict resolution", and then ready to submit. Enter the folder and look for files with yellow exclamation marks. These files are the places where conflicts occur. Handle conflicts according to the actual situation.
Rice size (with local modification code):
-- This means you have uncommitted native code.
Question mark (newly added resource):
--This indicates that the file is a new file resource in the project, and the new resource can be files, pictures, codes, etc.
Red exclamation mark (native code is not consistent with the library):
-- This means that the local code is not consistent with the library. If the user wants to repair, he can delete the file with the red exclamation mark icon and update it directly.
Gray right arrow (locally modified)
--The local code was not uploaded to the library in time.
Blue left arrow (modified on SVN)
--Remember to modify the code after updating the code, and compare the habits with svn before submitting.
Gray arrow to the right with a plus sign in the middle (more files locally than on SVN)
--Remember to be consistent with svn after modification
Blue arrow to the left with a plus sign in the middle (more files on SVN than local)
--After deleting the file, update it again to update all the files on svn.
Gray arrow to the right with a minus sign in the middle (locally deleted, but undeleted files on SVN)
--That is to say, after you delete the confirmation, you must remember to upload the library and keep it consistent with svn
The blue arrow with a minus sign in the middle (deleted on SVN, but not deleted locally)
-- Compare the code on the svn library, and update the svn (delete useless code) after confirming that it needs to be deleted.
Red two-way arrow (files that have been modified on SVN and modified locally)
-- this means that both local and svn have been modified. It is best to merge local modifications into svn, and update the code first before modifying the code.