SVN tutorial-branch and merge

Zhanhailiang Date: 2014-10-17

Application scenarios of branches

The conclusion is to facilitate parallel development.

Subversion has commands to help you maintain parallel branches of your files and directories. It allows
You to create branches by copying your data, and remembers that the copies are related to one another.
It also helps you duplicate changes from one branch to another. Finally, it can make portions of your
Working copy reflect different branches so that you can "mix and match" different lines of development
In your daily work.

Use branch and merge

1. Create branch 1.0 on the trunk:

After successfully creating the branch, update SVN to view the corresponding branch, and then complete the development task in the branch:

2. Merge branch 1.0 back to the trunk:

Merge all the modifications to the branch back to the trunk. Code conflicts may occur during this process. You need to manually confirm the modifications:

After merging, submit the code for updating the main branch to pre-release the branch:

SVN tutorial-branch and merge