但如果想集成开发人员在分支上的变更并检查支线与干线的合并,这个原理也适用于分支。
This can be extended to branches as well, with the intent of integrating changes among developers working on the branch and checking the merge with the mainline.
团队进行并行开发时,一定要以最高的频率将代码合并回干线(即主干)。
When a team develops in parallel, it's important to merge code back to the mainline (trunk) as often as feasible.
将变更合并回干线(即主干)的技巧
应用推荐