允许从集成分支合并到开发分支吗？
Do you allow merging from integration branches to development branches?
我们有6个成功的分支合并到主线上。
We had about 6 successful merges of forks back to the Cells mainline.
隔几周你就想将分支合并到主干上一下。
Every few weeks you want to merge from the branch into the trunk.
然后冲突(如果有的话)将会在现有的分支合并提交，而不是工作。
Then the conflicts (if any) will be in that merge commit rather than in your existing branch work.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
将一个分支的更改合并到另一个。
另一种机制就是使用其他的属性来管理分支或者合并。
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.
当合并两个或更多分支时，删除后缀，恢复原来的编号方案。
When two or more branches merge, the suffixes are dropped and numbering returns to the previous scheme.
这两个属性含有需求从什么地方分支，以及需求合并到什么地方的信息。
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.
然后，在不同开发人员工作的分支之间来回合并更改。
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.
不能进入合并至则意味着分支的需求尚未得到合并（参见图14，“使用属性以管理分支/合并”）。
No entry in merged to means that the branch requirement hasn’t been merged yet (seeFigure 14. Using attributes for managing branch/merge).
规则：每天都从主干向你的工作分支中合并代码。
将分支的变更合并到主干。
MultiSite利用了ClearCase对分支及合并的支持，因此任何在一个位置发生的变更可以与其他位置的变更同步并合并。
MultiSite leverages ClearCase's support for branching and merging, so any changes made at one location can be synchronized and merged with changes at other locations.
显示分支用例已经合并的属性。
本系列的第2部分将讨论Git的更高级应用：合并分支、生成差异(diff)和其他常见任务。
Part 2 of this series will discuss more advanced USES of Git: merging branches, generating diffs, and other common tasks.
高级的分支和图形化合并工具支持对文件的并发访问，以及对时间的有效使用。
Sophisticated branching and graphical merge tools enable concurrent access to files and efficient use of time.
这两个包含性分支在merge处再次合并。
这两个包含性分支在merge处再次合并。
应用推荐