Branch and merge source control team projects, folders, and files.
分支和合并源代码管理团队项目、文件夹和文件。
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是一个源代码控制系统，它可以跟踪代码库的修改，允许开发人员创建新分支和在单独环境中合并特性开发代码。
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.
拿到从那边得到的第二个子列表，这是一个基本情况,合并它，当这两个合并完成后，我们基本到了该分支阶段，这里我们可以把两个合并在一起。
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”，并让版本控制系统识别所有需要的变更。
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重构完成时就会有合并错误的风险。
The most common strategy under this model is to merge and test in the local branch.
该模型中最常用的策略是：在本地合并及测试。
How to run Continuous Integration (CI) against a branch that is under development and regularly test the merge against the trunk?
如何在开发中的主干运行持续集成(Continuous Integration,CI)，以定期测试分支与主干的合并？
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则分别对应于一个输出和输入条件。
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，后者又会激活它的两个传出分支。
They merge the changes down to their development branch and fix any conflicts.
他们将变更向下合并到自己的开发代码线，并修复任何冲突。
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 can make changes, commit them to their local repositories, and merge changes from others without affecting the main branch.
开发人员进行变更、提交变更到其本地的存储库，之后，在不影响主干的前提下，与其他开发人员的变更合并。
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流合并，这主意不错)。
This means, for each branch of the fork, the merge executes and triggers the activities further downstream in the process model.
这意味着，对于fork的每个分支，merge都将执行并触发流程模型中的下游活动。
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之后的所有任务执行多次。
The other branch causes a cycle between the fork and the merge.
另一个分支将导致fork和merge之间的循环。
Your managers and project leaders are expected to talk to you frequently enough to make certain you are aware of schedules, merge points, branch names, and release dates.
你的经理和项目负责人应经常与你交流以确保你时时记得进度表、合并点、分支名和发布日期。
To "merge branches" is to take some changes which were done to one branch and apply them to another branch.
“合并分支”就是将在一个分支完成了的变更应用到另一个分支。
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.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
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.
于髌骨内下方参与形成髌周动脉环的膝降动脉关节支的髌下支或膝下内动脉干长、位置恒定。
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.
于髌骨内下方参与形成髌周动脉环的膝降动脉关节支的髌下支或膝下内动脉干长、位置恒定。
应用推荐