Yellow exclamation mark (conflict):
-- This is a conflict. The conflict means that you have modified a certain file, and others have also modified this file. Others have submitted it before you submit it. The commit will be prompted to conflict, and you will not be allowed to commit, preventing your commit from overwriting someone else's changes. To resolve conflicts, if you confirm that your revisions are invalid, use TSVN to restore your revisions; if you think your revisions 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 the files with yellow exclamation marks. These files are the places where the conflict occurs. Handle the conflict according to the actual situation
(with local modified code):
-- This means that you have uncommitted local code.
Say hello (newly added resources): --This
means that the file is a newly added file resource in the project, and the new resource can be files, pictures, codes, etc.
Red exclamation mark (the local 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, they can delete the file with the red exclamation mark icon and update it directly.
Gray right arrow (locally modified)
-- the local code is not in the library in time.
Blue left arrow (modified on SVN)
-- remember to update the code and modify it, and compare it with svn before submitting.
Gray arrow to the right with a plus sign in the middle (there are more files on SVN than on SVN)
-- remember to be consistent with svn after modification,
blue arrow with a plus sign in the middle (more files on SVN than local) file)
-- after deleting the file, update it again to update all the files on svn.
Gray to the right with a minus arrow in the middle (locally deleted, but undeleted files on SVN)
-- that is to say, after you delete confirmation, be sure to remember to go to the library, consistent with svn,
blue to the left and the middle There is an arrow with a minus sign (files deleted on SVN, but not deleted locally)
-- compare the code on the svn library, and after confirming that it needs to be deleted, update svn (delete useless code).
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.
-- This is a conflict. The conflict means that you have modified a certain file, and others have also modified this file. Others have submitted it before you submit it. The commit will be prompted to conflict, and you will not be allowed to commit, preventing your commit from overwriting someone else's changes. To resolve conflicts, if you confirm that your revisions are invalid, use TSVN to restore your revisions; if you think your revisions 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 the files with yellow exclamation marks. These files are the places where the conflict occurs. Handle the conflict according to the actual situation
(with local modified code):
-- This means that you have uncommitted local code.
Say hello (newly added resources): --This
means that the file is a newly added file resource in the project, and the new resource can be files, pictures, codes, etc.
Red exclamation mark (the local 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, they can delete the file with the red exclamation mark icon and update it directly.
Gray right arrow (locally modified)
-- the local code is not in the library in time.
Blue left arrow (modified on SVN)
-- remember to update the code and modify it, and compare it with svn before submitting.
Gray arrow to the right with a plus sign in the middle (there are more files on SVN than on SVN)
-- remember to be consistent with svn after modification,
blue arrow with a plus sign in the middle (more files on SVN than local) file)
-- after deleting the file, update it again to update all the files on svn.
Gray to the right with a minus arrow in the middle (locally deleted, but undeleted files on SVN)
-- that is to say, after you delete confirmation, be sure to remember to go to the library, consistent with svn,
blue to the left and the middle There is an arrow with a minus sign (files deleted on SVN, but not deleted locally)
-- compare the code on the svn library, and after confirming that it needs to be deleted, update svn (delete useless code).
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.