下一章我会深入研究合并分支。
In the next chapter I will delve into the topic of merging branches.
所以我们来讨论如何合并分支的工作。
每个工具都在执行合并分支上有不同。
Each tool implements the merging of branches a little differently.
什么是“合并分支”？
只是，我们正试图明白我们在谈及合并分支时我们的真实含义。
Instead, let's just try to be clear about what we mean we speak about merging branches.
关于合并分支最重要的问题就是源码控制工具可以提供多少帮助。
The central question about merge branches is the matter of how much help the source control tool can provide.
“合并分支”就是将在一个分支完成了的变更应用到另一个分支。
To "merge branches" is to take some changes which were done to one branch and apply them to another branch.
必须要强调的是合并分支需要我们考虑各种类型的变更，而不是普通的编辑文件。
It is important here to mention that merging branches requires us to consider every kind of change, not just the common case of edited files.
我们称这个操作为“合并分支”，这是一个精辟的术语，隐含了物理树失败的原因。
We call this operation "merging branches", a term which highlights why the physical tree metaphor fails.
你的源码控制工具应该给你一个机会去在你提交合并分支的最终结果之前检查你的工作。
Your source control tool should give you a chance to do these checks before you commit the final results of a merge branches operation.
本系列的第2部分将讨论Git的更高级应用：合并分支、生成差异(diff)和其他常见任务。
Part 2 of this series will discuss more advanced USES of Git: merging branches, generating diffs, and other common tasks.
听来很简单吧？在实践中，合并分支通常是简单的。但是有的突出的案例却真的比较复杂。
Sounds easy, doesn't it? In practice, merging branches often is easy. But the edge cases can be really tricky.
在本章的剩余部分我都会用到“源”和“目标”来指明在一个合并分支操作中的两个分支。
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.
将一个分支的更改合并到另一个。
另一种机制就是使用其他的属性来管理分支或者合并。
An alternative mechanism is to use additional attributes for managing branching or merging.
值得注意的问题与循环流的正确分支和合并有关。
The noticeable problems relate to the correct branching and merging of the cyclic flows.
BPMN并不提供任何单独的建模元素来联接或合并流程模型中的多个分支。
BPMN does not provide any separate modeling elements to join or merge several branches in a process model.
从另一个存储库检索索引更新，并将其合并到当前分支的文件或目录。
Retrieves index updates from another repository and merges them into the files and directories in the current branch.
因此，您必须要么记录分支要么记录合并关系。
Therefore, you are limited to documenting either a branch or a merge relationship.
附加的需求属性可以帮助您管理需求从哪里分支以及合并到哪里。
Additional requirement attributes can help in managing where a requirement was branched off from and where it was merged to.
规则：经常从工作分支向主干合并代码，例如每完成一个故事之后。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
修订3是合并两个分支的结果。
从工作分支中取得并合并最新的代码，然后检入你的代码。
Merge down the latest from the work branch, and check in your code.
这两个属性含有需求从什么地方分支，以及需求合并到什么地方的信息。
They will hold the information about which requirement the requirement was branched off from and which requirement it has been merged with.
仅仅给变更打上任务号是不够的，成员必须要说明“将功能X合并入分支y”，并让版本控制系统识别所有需要的变更。
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.
允许从集成分支合并到开发分支吗？
Do you allow merging from integration branches to development branches?
然后，在不同开发人员工作的分支之间来回合并更改。
They then merge changes back and forth between branches that another developer is working on, and merge those changes in each time.
合并在满足其所有传入分支时才会运行。
The join runs when all of its incoming branches are satisfied.
我们有6个成功的分支合并到主线上。
We had about 6 successful merges of forks back to the Cells mainline.
我们有6个成功的分支合并到主线上。
We had about 6 successful merges of forks back to the Cells mainline.
应用推荐