SVN processing solves parallel development problems

In the work of two years ago, the development of the project version control is very strict, each need to change from the Trunck backbone new Branch Branch development, keep the backbone of the code at any time is a clean code, a ready to publish to the online code, but also to ensure that the actual development of code conflict problems

1: Branch Merge to Trunk-click Merge from Trunck

<1>: Since the trunk and the branch code are always there, modify a piece of code in the branch so that it differs from the skeleton code

<2>: Submit the Branch code:

Branch merge skeleton code, the mouse placed on the skeleton code, and then right-click, in order to do

<3>

<4>

<5>

<6>

<7>

2:svn merge from Trunk to branch

The process is basically the same as above, and the operation

<1>

<2>

<3>

<4>

3:SVN New Branch, the operation process is as follows, the process is not verbose, direct mapping, there are problems can be directly message

<1> first Right-click on the trunk svn, appearing as

<2>

<3>

4: Under-verbose, in the new branch under the branch to the trunk of the merge and the trunk-to-branch merge

<1> Branch to the trunk: Right-click on the trunk of the merge, as

<2>

<3> then it's the next step, and the end to the trunk SVN address, you can see the branch merge code. Such as

4: From the trunk to the new branch, direct mapping, it is not a word wordy

<1>

<2>

<3> Direct next action to the end, and then in the branch code you can see the code submitted by the backbone.

I believe we are now on the SVN new branch, and the trunk, the merger between the branches are familiar with, of course, the same can be arbitrarily merged between the branches, I hope to help you!

SVN processing solves parallel development problems