Sounds easy, doesn't it? In practice, merging branches often is easy. But the edge cases can be really tricky.
听来很简单吧？在实践中，合并分支通常是简单的。但是有的突出的案例却真的比较复杂。
Often teams like to have their own branches to avoid having partially complete stories causing interference between teams.
通常，团队希望有自己的分支，以避免未完成的故事在多个团队之间造成干扰。
User access in the branches is often centrally managed.
分支中的用户访问通常是集中管理的。
The old forest canopies often have those snags, which are big dead branches that break off and can fall erratically when the tree comes down.
老林冠往往有这种枯干，很大的死树枝，随大树倒下而崩断，不知掉到哪里去。
But on Slashdot, a comment will often provoke a new thread of conversation-a tree with more branches.
但是在Slashdot上，一条留言往往会引发出新的讨论话题——具有更多枝桠的讨论树。
This is often used for short-range branches where the destination is near the current location, so specifying an offset rather than an absolute address makes more sense.
这通常用于短程分支，其中目标地址距当前位置很近，因此指定一个偏移量(而不是绝对地址)会更有意义。
When your team works in parallel on different branches, often two people are working on the same file at the same time.
当您的团队在不同的部门中并发地工作时，通常有两个人同时处理同一个文件。
Very often, users are not aware of the global effect of a stop node and use it to end each of the individual branches of a process.
通常，用户不会察觉到停止节点的全局效果，而只是用它来终止某个流程中的每个单独的分支。
In ancient times, yoga was often referred to as a tree, a living entity with roots, a trunk, branches, blossoms, and fruit.
在远古时代，瑜伽被比喻做一棵树，有根基，躯干，枝桠，花蕾，还有果实。
This often means reconciling an existing LDAP organizational tree with the desired WebSphere Commerce layout, and adding new branches for the WebSphere Commerce specific resources.
这通常意味着可以使用所需的WebSphereCommerce布局协调现有的LDAP组织树，并添加WebSphere Commerce特定资源的新分枝。
Banks often lack a thorough understanding of how many branches they can apply for each year and how concurrent applications will be treated.
银行通常对它们每年能申请开办多少家分行以及可以同时处理多少个申请没有一个完全的了解。
Symbolic logic is often divided into two branches, propositional logic and predicate logic.
符号逻辑往往分为两个分支，命题逻辑和谓词逻辑。
The threadlike branches are often woven together to form a velvety body sometimes longer than 12 in. (30 cm).
藻体呈丝状，分枝多，常交织形成天鹅绒般的假原植体，长达30公分以上。
The threadlike branches are often woven together to form a velvety body sometimes longer than 12 in. (30 cm).
藻体呈丝状，分枝多，常交织形成天鹅绒般的假原植体，长达30公分以上。
应用推荐