Do not commit changes (from a branch merge) to the trunk which may break it?
不要提交一些可能破坏trunk的内容，例如从branch合并。
Medial inferior genicular artery and inferior patellar branch of the descending genicular arterial articular branch merge and accede to prepatellar ring on inferior medial to patella.
于髌骨内下方参与形成髌周动脉环的膝降动脉关节支的髌下支或膝下内动脉干长、位置恒定。
Merge down the latest from the work branch, and check in your code.
从工作分支中取得并合并最新的代码，然后检入你的代码。
When these two merges are done, we're basically at a stage in that branch where we can now merge those two together, which gives us that, and it goes through the rest of it.
拿到从那边得到的第二个子列表，这是一个基本情况,合并它，当这两个合并完成后，我们基本到了该分支阶段，这里我们可以把两个合并在一起。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
规则：经常从工作分支向主干合并代码，例如每完成一个故事之后。
Therefore, you are limited to documenting either a branch or a merge relationship.
因此，您必须要么记录分支要么记录合并关系。
Merely tagging change sets with task Numbers isn't enough; one has to be able to say "merge feature X into branch y" and have the source control identify every change set that is needed.
仅仅给变更打上任务号是不够的，成员必须要说明“将功能X合并入分支y”，并让版本控制系统识别所有需要的变更。
No entry in merged to means that the branch requirement hasn’t been merged yet (seeFigure 14. Using attributes for managing branch/merge).
不能进入合并至则意味着分支的需求尚未得到合并（参见图14，“使用属性以管理分支/合并”）。
The most common strategy under this model is to merge and test in the local branch.
该模型中最常用的策略是：在本地合并及测试。
Rule: Merge from trunk to your work branch every day.
规则：每天都从主干向你的工作分支中合并代码。
Merge changes from branch back to the trunk.
将分支的变更合并到主干。
How to run Continuous Integration (CI) against a branch that is under development and regularly test the merge against the trunk?
如何在开发中的主干运行持续集成(Continuous Integration,CI)，以定期测试分支与主干的合并？
Even though Rational RequisitePro was not designed for such an environment, thus has no branch or merge capabilities included, it can provide support for this scenario to some degree.
虽然RationalRequisitePro不是为这样的一种环境所设计的，也因此没有提供分支或者合并功能，但它在某些程度上还是可以支持这一使用场景。
To increase the support of Rational RequisitePro for branch or merge scenarios, add two additional attributes to every requirement type that will be affected by branch or merge action.
为了增加RationalRequisitePro对于分支或者合并场景的支持力度，您需要向每一种需求类型添加两个附加的属性，分支或者合并操作会影响到这些需求类型。
All backward connections into one branch of the merge should originate from the same branch of the decision to avoid implicit deadlocks or a lack of synchronization.
进入merge任意分支的所有逆向连接都应源自decision的同一分支，只有这样才能避免出现隐式死锁或缺乏同步问题。
Decision and merge are always mapped to several input and output criteria-one for each branch, while fork and join correspond to a single output and input criterion, respectively.
Decision和merge始终映射到多个输入和输出条件，每个分支对应一个条件，而fork和join则分别对应于一个输出和输入条件。
Each outgoing branch of the fork with all its connections ends as an incoming branch of the merge.
fork的每个传出分支都将其连接末端用作merge的传入分支。
Task 7 following the corresponding merge would therefore execute twice-once for each triggered branch.
因此，相应merge后的Task7将执行两次，即对每个触发的分支执行一次。
The upper branch of the inclusive decision connects to a third cyclic process fragment with a merge preceding a fork.
inclusive decision 最上方的分支使用fork 之前的merge连接到第三个循环流程片断。
Even if the di work is performed on a branch that is divergent to the one where features and bug fixes are still being coded, there is a risk of merge-hell when the di refactor is finished.
即便仅在一个分支上进行DI重构的工作，这跟仍然在进行功能开发和缺陷修复的其他分支也是背道而驰的，当DI重构完成时就会有合并错误的风险。
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.
但如果想集成开发人员在分支上的变更并检查支线与干线的合并，这个原理也适用于分支。
They merge the changes down to their development branch and fix any conflicts.
他们将变更向下合并到自己的开发代码线，并修复任何冲突。
They can make changes, commit them to their local repositories, and merge changes from others without affecting the main branch.
开发人员进行变更、提交变更到其本地的存储库，之后，在不影响主干的前提下，与其他开发人员的变更合并。
Subversion is a source code control system that tracks changes to the code base and allows developers to branch and merge code to work on features in a separate environment.
Subversion是一个源代码控制系统，它可以跟踪代码库的修改，允许开发人员创建新分支和在单独环境中合并特性开发代码。
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，后者又会激活它的两个传出分支。
The HEAD stream is the main code stream that users should be integrating to (if they want to branch off on their own and then merge with the HEAD stream later, that's fine).
HEAD条目是用户应集成的主要代码流(如果它们需要自己分叉并稍后与HEAD流合并，这主意不错)。
Using the merge leads to a lack of synchronization because the merge will always be triggered once for each incoming branch, and all tasks following the merge execute multiple times.
使用merge 会导致缺乏同步，因为对于每个传入分支，都会触发一次 merge，从而会将 merge之后的所有任务执行多次。
If a merge is never necessary, then you probably have the responsibility of maintaining the branch forever.
如果不需要合并，那你可能就要有永远维护分支的责任。
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 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 。
应用推荐