In the next chapter I will delve into the topic of merging branches.
下一章我会深入研究合并分支。
Instead, let's just try to be clear about what we mean we speak about merging branches.
只是，我们正试图明白我们在谈及合并分支时我们的真实含义。
We call this operation "merging branches", a term which highlights why the physical tree metaphor fails.
我们称这个操作为“合并分支”，这是一个精辟的术语，隐含了物理树失败的原因。
Sounds easy, doesn't it? In practice, merging branches often is easy. But the edge cases can be really tricky.
听来很简单吧？在实践中，合并分支通常是简单的。但是有的突出的案例却真的比较复杂。
Part 2 of this series will discuss more advanced USES of Git: merging branches, generating diffs, and other common tasks.
本系列的第2部分将讨论Git的更高级应用：合并分支、生成差异(diff)和其他常见任务。
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.
必须要强调的是合并分支需要我们考虑各种类型的变更，而不是普通的编辑文件。
Do you allow merging from integration branches to development branches?
允许从集成分支合并到开发分支吗？
As with your branches, you need to spend some time understanding the questions about merging in this section.
与你的分支一样，你需要花一些时间在本节里理解关于合并的问题。
We also discuss branches and merging.
我们也会探讨分支和合并。
Revision 3 is the result of merging two branches.
修订3是合并两个分支的结果。
Allow parallel development and manage merging from branches.
允许平行开发以及管理来自不同分支机构的合并。
RequisitePro requirement documents should be added to other baselines by merging them to the corresponding baseline branches.
RequisitePro需求文件应该通过将需求文件，合并到相应的基线分组中，来把需求文件添加至其他的基线中。
Each tool implements the merging of branches a little differently.
每个工具都在执行合并分支上有不同。
Provides information about branching and merging versioned code branches in team projects.
提供有关对团队项目中受版本控制的代码分支进行分支和合并的信息。
With fast topology analysis algorithm based on connection rules and node merging, the connection conditions of branches and buses are determined according to the primary topology.
基于连接规则和节点融合的快速拓扑分析算法，根据原始拓扑关系确定各支路与母线的连接情况。
With fast topology analysis algorithm based on connection rules and node merging, the connection conditions of branches and buses are determined according to the primary topology.
基于连接规则和节点融合的快速拓扑分析算法，根据原始拓扑关系确定各支路与母线的连接情况。
应用推荐