Svn branch management

background ： Now you basically use git Management code , Yes git Branch processing should be familiar , Record the ancient svn Branch usage .

1.TortoiseSVN Deal with branch merging

1.1 use TortoiseSVN Repo-browser, Code base first copy to , Create a branch b2

![](https://img-blog.csdnimg.cn/6db0d713d71246b48a48bc140fe17373.png

1.2 At this point, you can see that the version library has The trunk trunk Branch b1 b2

1.3 Detected locally b2

1.4 Local b2 Branch changes , odd file 003, Commit to the repository Branch b2

1.5 Local branch merging

1.6.merge type

1. Merge a range of revisions

b1 Branch new file 111.txt, Submit branch version Library

from Branch version Library , Merge into local trunk

2. Merge two different trees

Confusing concepts

stay From Choose from trunk The path of , stay to Choose from branches route . stay merge when , Before and after the version will first compare the content , The difference part copy To local .From It's on the left , Similar to the original version ,to It's on the right , Similar to the modified program .

Wrong understanding : from Merged source branches ,to The target branch of the merge . The following copy Options .
Correct understanding : from The original version ,to The revised program , The difference part copy To the local original version trunk.

You can test test merge, View conflicts , Equivalent to print preview

merge after , You can see ,trunk Has merged b2 The content of the branch

Submit version Library trunk

2.IDEA Deal with branch merging ( Recommended )

2.1 Switch to main branch trunk, see svn Current environment of

system project , Local Trunk Branch , on-line Trunk Branch

Merge from Select sub branches to merge into the current trunk trunk

There are conflicts ,idea Will prompt , stay idea The solution on the tool is friendly .