Yellow exclamation point (conflict):
This is a conflict, the conflict that is you make a change to a file, others on this file has been modified, others grab before you commit to submit, and then you submit it You will be prompted to conflict, but does not allow you to submit, submit your cover to prevent modification of others. To resolve the conflict, if you confirm that your changes are invalid, the use TSVN revert your changes on the line; If you think that your changes are correct, others submitted is invalid, then use TSVN first labeled as "Resolving Conflicts" and then you can submit up; if you think your changes and others are part of the modifications to be effective, then you put manually modify others to merge your changes, and then use TSVN labeled as "Resolving conflicts", then you can be submitted. Into the folder, find the file has a yellow exclamation mark, place the files that conflict, according to the actual situation of conflict
meters size (there are local modifications Code):
This is the code that you have a local uncommitted.
Say hello (newly added resources):
This indicates that the file is a project file new resources, additional resources may be files, images, code, and so on.
Red exclamation mark (native code library is not consistent):
This indicates that the local code is not consistent with the library, if you want to fix, you can delete the file with a red exclamation point icon, you can directly update.
Gray right arrow (local modified)
native code no time on the library.
Blue left arrow (modified on SVN)
remember modified to update the code, used to contrast with the svn before submitting.
Gray right and middle of a plus arrow (local than SVN extra file)
modify consistent with svn remember
the blue arrow to the left and in the middle of a plus sign (and more than a local file on SVN)
after the file is deleted, the update again, the svn update all the files down.
Gray arrow to the right and middle of a minus sign (locally deleted, but not delete files on SVN)
That is after you delete confirmation, we must remember that the library remain consistent with the svn
blue to the left and the middle of a minus arrow (deleted on SVN, and local undeleted files)
compared with the previous svn library code, after determining the need to delete, update, svn (delete dead code).
Red double-headed arrow (modified on SVN, but also local modified files)
that represent local and svn are modified, the best idea is to merge local modifications to svn, last modified first before updating the code.
Reproduced in: https: //www.cnblogs.com/liuqianyu/p/5639363.html