SVN merge Code 2: Merge the code between two versions of the Branch to the trunk

Background: A branch was created from the trunk a few months ago due to development needs. Now the development is complete and tested in a separate test environment and the branch code has been merged to the trunk, at the same time, another colleague modified the Code with our branch. After we merged the branch code into the trunk, his Code was submitted to the branch, in this case, he wants to merge the Code submitted to the branch into the trunk.

The procedure is as follows:

1. First, obtain the version number of the Branch before the branch is submitted (set to version A) and the version number of the branch after the branch is submitted (set to Version B ). To obtain the branch version number, right-click the project and choose "team" to display the resource history.

2. Merge code:

Select the folder for code merging, or select the entire project, right-click-team-merge-select merge two different tree, and click Next, as shown in the following information:

 

3. Click Next to finish. For conflicting files, select to resolve them later.

4. For details about how to merge conflicting files, see.

 

Note: Merge the code between the two major versions into the same branch.

 

For methods to merge the branch code into the trunk, see: http://www.cnblogs.com/step-by-step1/p/3989127.html

 

SVN merge Code 2: Merge the code between two versions of the Branch to the trunk