SVN version control branch and merge function use

Catalog

One 、 Create trunk folder

Two 、 Branch out

1. Branch out

2. Modify the branch

​ edit  

3、 ... and 、 Merge

---

functional requirement ：

1： The developer controls the change submission Control Branch ,

2： After the test is correct, it is merged into the trunk project ,

3： Prevent untested functions from affecting online projects .

One 、 Create trunk folder

1： Create trunk folder Parent( Random names ), Used to store development projects

 

Two 、 Branch out

1. Branch out

1： Select project — TortoiseSVN — Branch / Mark

 

 2： Prompt that the copy is complete ！—— Update project

 

3： After the update, you can see that the branch has been successful

 

 

2. Modify the branch

 1： Submit the branch project after modification

2： After the submission is successful, you can see that the branch submission does not affect the trunk

 

3、 ... and 、 Merge

1： Select trunk file — TortoiseSVN — Merge

 

 

 

 

2： Submit the project after merging, and you can see that the trunk project has merged the modified content of branches