Project version Control 2

First, the code merge

1. Branch merge to Trunk (Operation Object Trunk)

Operation Steps:

Find the location where the code is stored under development tools

Tortoisesvn-->merge ...

Selection: Merge a range of revisions

URL to merge from fill branch path to merge

Last click Merge merges

Note: If conflicts occur after merging, they are processed directly inside the development tool.

2. Trunk Merge to branch (Operation Object Branch)

Principle Ibid.

Second, the main score branch

Requirements: When the software version needs to add new functionality, iterative development requires a branch from the backbone to be developed on the branch

1, in the main directory of SVN select Tortoisesvn-->branch/tag ...

2. To path: Select the directory after which the branch is stored and then fill in the branch folder name

3, finally click OK on the line

Iii. Other Notes

1, generally in the branch (Branch) after the development of the new version will be merged into the trunk (trunk) up, so that the backbone of the code is up-to-date, merging method (refer to the "code merge" above)

2, the Branch (Branch) on the code in addition to the trunk (trunk) up, but also put on the tag to save, equivalent to make a backup. How to Operate (refer to the "backbone scoring branch" above) Note: The operand is the code on the branch.

Project version Control 2