SVN教程——分支与合并

  作者：zhanhailiang 日期：2014-10-17

分支的应用场景

总结一句就是方便并行开发。

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.

使用分支与合并

1. 在主干上创建分支1.0：

创建分支成功后更新svn可以看到相应的分支，接下来就可以在该分支中完成开发任务：

2. 将分支1.0合并回主干：

将分支所有修改合并回主干，此过程中可能会发生代码冲突，需要手工确认修改：

完成合并后提交更新主干分支的代码即可进行预发布等流程：