Workarounds for Code submission Conflict issues common in SVN version management tool usage

I believe that just beginning to learn to use SVN's partners in the project development process must often encounter a number of problems affecting their own code, I listed here are several common issues and solutions to the problem:

1. Accidental deletion and mis-operation of the problem

question 1: Have A and b two people work together to write the project, b in writing code when accidentally changed a write code file content submitted to the warehouse, a how to retrieve their original code?

Workaround:

Right click on the modified file----> click on the TORTOISESVN option-----> Click on the Show Log option, the window will appear,

Then right-click on the record of a---> click the revert to this revision option---Select the revert option in the Pop-up dialog box, when the contents of this window show that the recovery was successful, It's amazing to see if the contents of the file are restored to the previous content.

The problem 2:b accidentally deleted a write code file, and submitted, a how to retrieve their original code file it?

Workaround:

Right-click a user check out the items folder (for example)---> click the tortoisesvn option-----> Click on the Show Log option, and then find the log in B for the delete operation before the code file, copied out, After renaming, submit the project again.

2. When multiple users modify an updated file from the repository at the same time, the submitted user submits a non-pass issue:

Issue 1: (A and B two users modified content location inconsistent) A and B two users of the same from the warehouse just update the file after the modification, B first committed, a submitted error, a should be how to deal with it? ( This error will occur after the submitted user)

Error:

The content in the final file is that SVN automatically merges two user-modified content (SVN auto-merge is a case where the number of rows of two user-modified content does not conflict).

Solution: A user found the B user to co-negotiate how to deal with two people modified code.

Issue 2: (A and B two users modified the same location (the contents of the same row were modified)) A and B two users are the same from the repository just update the file after the modification, B first committed, a submitted error, a should be how to deal with it? ( This error will occur after the submitted user)

Error:

three extra files

Explanation of the extra three files (from top down):

The first one:

The second: (I (A) want to submit the code)

The third one:

Fourth one:

Workaround:

According to the above three versions of the code, a should know how to modify the code to commit, first restore to the current server in the latest version of the code file,

Talk to B again about what to do with the modified code.

Question 3: If A and B conflict with too many code, a how to deal with it?

When you encounter this situation:

Workaround:

Do not update, and should choose Cancel this (because clearly know that there is a conflict do not give yourself trouble), copy your own modified code files to another place, and then renamed and then copied to the original folder,

You can find out the difference between your modified content and the code in the server, then you can find B to discuss and modify it together.

Copyright NOTICE: This article for Bo Master original article, without Bo Master permission not reproduced.

Workarounds for Code submission Conflict issues common in SVN version management tool usage