Home > Article > Backend Development > A brief analysis of SVN common problems and solutions_PHP tutorial
A brief analysis of SVN common problems and solutions_PHP tutorial
- WBOYOriginal
- 2016-07-21 15:04:33932browse
Yellow exclamation mark (conflict):
--This is a conflict. A conflict means that you have modified a certain file, and someone else has also modified the file, and others have stolen it. If you submit before you submit, you will be prompted for a conflict when you submit again, and you will not be allowed to submit to prevent your submission from overwriting other people's modifications. To resolve conflicts, if you confirm that your modifications are invalid, just use TSVN to restore your modifications; if you think your modifications are correct and other people's submissions are invalid, then use TSVN to first mark "Resolve Conflicts" , and then you can submit it; if you think that part of your modifications and other people's modifications are valid, then you can manually merge other people's modifications into your modifications, and then use TSVN to mark them as "Resolve Conflicts", and then You can submit it. Enter the folder and look for files with yellow exclamation marks. These files are where conflicts occur. Handle the conflicts according to the actual situation
Mi font size (with local modified code):
--This means you have unsubmitted local code.
Say hello (newly added resource):
--This indicates that the file is a new file resource in the project. The new resource can be files, pictures, codes, etc.
Red exclamation mark (the local code is not consistent with the library):
--This indicates that the local code is not consistent with the library. If the user wants to fix it, he can delete the file with the red exclamation mark icon , just update 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 after updating the code, and compare with svn before submitting.
A gray arrow pointing to the right with a plus sign in the middle (more files locally than on SVN)
--After modification, remember to keep it consistent with svn
Blue arrow pointing to the left with a plus sign in the middle (more files on SVN than locally)
--After deleting the file, update it again to update all the files on svn Come down.
A gray arrow pointing to the right with a minus sign in the middle (files that have been deleted locally but not deleted on SVN)
--that is to say, after you confirm the deletion, you must remember to Library, consistent with svn
Blue arrow pointing to the left with a minus sign in the middle (files deleted on SVN but not deleted locally)
--Compare the code in the svn library and confirm that it needs to be deleted , update svn (remove useless code).
Red two-way arrow (files modified on SVN and modified locally)
--This means that the files have been modified locally and on svn. It is best to merge the local modifications into svn. Update the code last before modifying it.
If you want to succeed, you must first believe in yourself, and secondly, you must win the trust of your friends around you!