Brief analysis of SVN common problems and their solutions

  • 2020-06-15 07:59:04
  • OfStack

Yellow exclamation mark (with conflict):
A conflict is when you make a change to a file and someone else makes a change to the file. Someone else submits the file before you submit it. If you submit the file again, you will be prompted for a conflict. To resolve the conflict, if you confirm that your changes are invalid, restore your changes with TSVN. If you think your changes are correct and someone else's commit is invalid, mark it with TSVN as "Conflict Resolution" and then commit. If you consider both your changes and those of others to be valid in part 1, then you manually incorporate the changes of others into your changes, then use TSVN to mark them as "Conflict Resolution" and you are ready to commit. Go into the folder and look for the files with the yellow exclamation mark. These files are where the conflicts occur. Handle the conflicts according to the actual situation

Rice size (with locally modified code) :
This means you have uncommitted native code.

Hello (new resources added):
-- This means that the file is a new file resource in the project, which can be files, pictures, codes, etc.

Red exclamation point (local code and library not kept 1 send) :
If the user wants to fix it, he can delete the icon file with red exclamation mark, just update.

Gray to right arrow (locally modified)
- The local code is not loaded in time.

Blue left arrow (modified on SVN)
Remember to update the code and make changes. Compare your habits with svn before submitting.

Gray to the right with a plus sign in the center (more local files than on SVN)
-- Remember to keep 1 to svn after modification

Blue arrow with a plus sign in the middle (more files on SVN than local)
After deleting the file, update again to update all the files on svn.

Gray to the right with a minus sign in the center (deleted locally, not deleted on SVN)
-- That is to say, after you delete the confirmation, 1 must remember to go to the library, keep 1 to svn

Blue arrow left with a minus sign in the middle (SVN deleted, local undeleted files)
- Compare the code on the svn library, confirm that you need to delete, and update svn(remove unwanted code).

Red two-way arrow (modified on SVN, modified locally)
This means that both the local and svn changes have been made. It is best to merge the local changes into svn and update the code last before making any changes.
To be successful, we must first believe in ourselves and then win the trust of our friends around us!


Related articles: