Tortoisesvn usage and conflict resolution

Next, try to use tortoisesvn to modify files, add files, delete files, and resolve conflicts.

Add File

Upload a readme.txt text file in the current work notebook. At this time, the text file will be displayed in a state without version control ,:

In this case, you need to inform tortoisesvn of your operations ,:

After adding the file, your file will become in this state ,:

In this case, use tortoisesvn to submit the file, so that others can see your changes ,.

Modify file

Use tortoisesvnto update, modify the readme.txt file in the work appendix, and add "Hello world! ", After saving, you will find that the icon of the readme.txt file has changed ,:

This red exclamation mark indicates that the file has been modified. At this time, submit the change and others will see your change.

Rename a file

Use tortoisesvnto update the file "readme1.txt'" in the "RENAME" Work subitem, and save it later. You will find that the icon in the "readme.txt" file has changed ,:

Add a file. In this case, you need to tell tortoisesvn about your operations ,:

The readme.txt file in the waiting database will be renamed to "readme1.txt ".

Delete an object

Use tortoisesvnto update the file. Use tortoisesvnto Delete the readme.txt file in the subfile and submit the file. The corresponding file in the version library is deleted ,:

Write comments forcibly

To give you a clearer picture of the cause of each change you have made in the future, you should write comments each time you submit them and try to make them as detailed as possible .:

However, some people may find it too cumbersome to enter comments without entering comments, which is not conducive to future version control. You can force the comments to be written at submission, right-click, select tortoisesvn-> attribute ,:

In the displayed dialog box, click New> log size to set the minimum number of characters for the submitted log and the minimum number of characters for the locked log to 20, in the submit text box, the character position of the edge is set to 100. Click OK ,:

Submit. If the input comments are less than 20 characters, they cannot be submitted.

Conflict Resolution

Conflict is the most common problem. It is generated in this way. User A checks out a working copy, and user B checks out a working copy B. then, user a modifies the file C in copy a (it can be content modification, file deletion, renaming, and location movement) and submits the file. at this time, user B also made changes to the same part of file C. If user B submits the changes, the system will first be notified that the version is out of date and requires updates. Then, a conflict will be prompted during the update, at this time, you can use the conflict editor to manually select.