1. Status + + file path name of the file to view the status of a file or directory the svn (which may be self-Baidu state), the status attribute for the 'C' of said change file or directory in conflict
2. Use svn resolve --accept working + path + filename to resolve the conflict execute this command will delete .mine, .r and other documents
3. Use svn resolved + path + filename identifies the file has been resolved conflicts
4. Re-submission: "Submit Comment" svn commit -m + path + file name!