Handling of SVN commit code conflicts

Tools:

A developed computer, myeclipse,tortoisesvn1.8

Steps:

1, whether it is a commit, update, edit the first action should be synchronized with the resource pool, the project right-click = "team==> in the resource pool synchronization

(It is important to note that SVN is already integrated in your development environment and can be used directly in MyEclipse).

2. When you synchronize with the SVN repository, you'll see how many files you need to update on your current project, and how many files to submit. Such as:

3. Here we know the situation is the operation of the order of the problem, I personally recommend to update the file without conflict to the local, and then edit the conflict file, the final Test confirmation no problem and submit to SVN.

   Update: Update the code that someone uploads to your local environment, and you merge your code into this version in this environment.

   Commit: Submit the consolidated version to SVN, and others will develop according to the version you submitted to ensure that the code does not conflict.

   It is important to note that the purpose of using SVN is to share an up-to-date directory for multiple people, and you should update it when you submit it, and then submit it to the latest version of the check.
   
   Because if you do not update the direct submission, this period of time is likely to be updated by others have been submitted, you do not update or the old version, the direct submission will be updated by others to cover out.

   Edit conflicts: such as

4. In the above picture you need to focus on pictures 2 and 3. The edit conflict is a blue and red contrast box appears. Blue can be clicked in the middle of the small square from the server to move to the local, red after the move has to be manually modified to the same, otherwise there will be conflicts. These things are done. Save it, make sure that your local parts are consistent with the server, and that this change or commit is not available on the server. It is also marked as a merge as shown in Figure 3.

5. The final step is to commit, but I suggest that you run it locally before submitting it to see if there are any bugs, errors, and so on. Confirm that there is no problem and then go back to that repository comparison interface to select Submit.

Handling of SVN commit code conflicts