值得注意的问题与循环流的正确分支和合并有关。
The noticeable problems relate to the correct branching and merging of the cyclic flows.
如何在开发中的主干运行持续集成(Continuous Integration,CI)，以定期测试分支与主干的合并？
How to run Continuous Integration (CI) against a branch that is under development and regularly test the merge against the trunk?
与你的分支一样，你需要花一些时间在本节里理解关于合并的问题。
As with your branches, you need to spend some time understanding the questions about merging in this section.
但如果想集成开发人员在分支上的变更并检查支线与干线的合并，这个原理也适用于分支。
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 they are stable, you can merge branches back to the main tree.
日本三菱日联金融集团与摩根·斯坦利决定合并他们在日本的证券分支机构，将其打造成日本最大的证券经纪商之一。
Japan's Mitsubishi UFJ and Morgan Stanley decided to merge their Japanese securities units, creating one of Japan's biggest brokers.
你的经理和项目负责人应经常与你交流以确保你时时记得进度表、合并点、分支名和发布日期。
Your managers and project leaders are expected to talk to you frequently enough to make certain you are aware of schedules, merge points, branch names, and release dates.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
应用推荐