什么是“合并分支”？
So let's talk about how merge branches works.
所以我们来讨论如何合并分支的工作。
A tool without merge history can still merge branches.
一个没有合并历史的工具仍然可以合并分支。
When they are stable, you can merge branches back to the main tree.
当分支稳定后，再将分支与主树进行合并。
The final step in a merge branches operation is a review by the developer.
在合并分支操作中最后一步就是开发人员去评估合并分支操作。
To "merge branches" is to take some changes which were done to one branch and apply them to another branch.
“合并分支”就是将在一个分支完成了的变更应用到另一个分支。
The central question about merge branches is the matter of how much help the source control tool can provide.
关于合并分支最重要的问题就是源码控制工具可以提供多少帮助。
Your source control tool should give you a chance to do these checks before you commit the final results of a merge branches operation.
你的源码控制工具应该给你一个机会去在你提交合并分支的最终结果之前检查你的工作。
For the remainder of this chapter I will be using the words "origin" and "target" to refer to the two branches involved in a merge branches operation.
在本章的剩余部分我都会用到“源”和“目标”来指明在一个合并分支操作中的两个分支。
BPMN does not provide any separate modeling elements to join or merge several branches in a process model.
BPMN并不提供任何单独的建模元素来联接或合并流程模型中的多个分支。
When two or more branches merge, the suffixes are dropped and numbering returns to the previous scheme.
当合并两个或更多分支时，删除后缀，恢复原来的编号方案。
They then merge changes back and forth between branches that another developer is working on, and merge those changes in each time.
然后，在不同开发人员工作的分支之间来回合并更改。
Parallel branches can then be synchronized using the Join or Merge constructs.
并行的分支就可以通过使用Join或者Merge来实现同步。
Bazaar manages revisions and can diverge and merge to create and collect branches, respectively. Here are some of the key concepts in Bazaar.
Bazaar管理修订，可以分别通过分叉和合并创建和收集分支。
The uncontrolled iteration of Task 4 and Task 5 becomes evident during a simulation, because for each execution of the fork with its two outgoing branches, the corresponding merge executes twice.
在模拟期间，Task4和Task5的无控制迭代将显现出来，因为每次执行fork将得到两个传出分支，因此其相应的merge将执行两次。
The second and third branches both lead to Task 2 and do not involve any activity between the decision and the first merge.
第二个和第三个分支都引向Task2，它们在 decision 和第一个merge之间不执行任何活动。
At least one of the incoming branches of the merge must come from outside the cyclic process fragment, or this process fragment could not be reached from other activities.
merge必须至少有一个传入分支来自循环流程片断的外部，否则将无法从其他活动到达此流程片断。
When this backward branch enters the merge, the merge executes and triggers the fork again, which in turn activates its two outgoing branches.
当此逆向分支进入merge时，将执行merge并再次触发fork，后者又会激活它的两个传出分支。
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.
但如果想集成开发人员在分支上的变更并检查支线与干线的合并，这个原理也适用于分支。
The anti-pattern in Figure 19 shows a process model with alternative branches where item D, which is only produced by the lower branch, bypasses the merge to enter Task 4 directly.
图19 中的反模式显示了一个含有可选分支的流程模型，其中的项目D 只能由下面的那条分支生成，它绕过merge，直接进入Task4 。
The inclusive branches are merged again by a merge.
这两个包含性分支在merge处再次合并。
Again, even if only a subset of at least two branches ends in the merge, a lack of synchronization occurs.
同样，即使至少两个分支的子集以merge结尾，也会出现缺乏同步问题。
When the inclusive decision is paired with a merge it can lead to a lack of synchronization when several branches execute in parallel.
如果将inclusivedecision与merge 组对，则在要并行执行多个分支时，inclusive decision 将导致缺乏同步问题。
When the inclusive decision is paired with a merge it can lead to a lack of synchronization when several branches execute in parallel.
如果将inclusivedecision与merge 组对，则在要并行执行多个分支时，inclusive decision 将导致缺乏同步问题。
应用推荐