分叉代码(合并冲突)。
合并冲突性的更改：非逻辑性的合并。
活动的创建有助于管理任何可能的合并冲突和解决措施。
This activity is created to help manage any possible merge conflicts and resolutions that may occur.
你可以从集成流集成代码到开发流，这包括移动标签并解决合并冲突。
You can have code merging from the integration stream to your development stream, which involves moving labels and resolving merge conflicts.
此时文件无法签出，可能是因为在签出期间发生了合并冲突。
This time, the file was unable to be checked out, perhaps because of a merge conflict during checkout.
这是因为如果您同时还在更新的文件上工作，更新文件本身将造成合并冲突。
This is because trying to update the files themselves could introduce merge conflicts if you were also working on the same files.
而有些时候，开发人员合并的频率太低，结果导致了合并冲突、瓶颈以及发布延误。
Other times, developers merge less frequently, leading to merge conflicts, bottlenecks, and delayed releases.
查询驱动图而非手动绘制图的使用，能够降低可能发生的与图相关的合并冲突的数量。
The use of query-driven diagrams instead of hand-drawn diagrams can reduce the number of diagram-related merge conflicts that might otherwise occur.
这可以是有帮助，如果您想要变更您的工作区中的项目，然后将它签入不必强制解决合并冲突。
This can be helpful if you want to change an item in your workspace and then check it in without being forced to resolve any merge conflicts.
当您在处理大型的模型时，部分模型一般会分割为单独的资源，以得到更好的性能，并降低合并冲突的可能性。
When working with a large model, portions of the model are typically fragmented into separate resources for better performance and to reduce the possibility of merge conflicts.
如果无法经常将代码合并到主干的话，可以运行测试，这样就能够确定是否会发生合并冲突，从而使实施合并没有那么困难。
If it's not possible to commit the merged code back to the trunk frequently, test runs can determine if any merge conflicts will occur so that merges are less painful when they are committed.
运行Hudson等CI服务器来测试合并可以提供一个预警系统，警告可能会在开发周期中发生潜在的合并冲突。
Running a CI server such as Hudson to test merges can give you an early warning system that alerts you to potential merge conflicts that could occur later on in the development cycle.
与「取得」作业不同的是，取得作业会自动合并两个档案版本的可协调差异，并协助您手动合并冲突，但是解除搁置作业则不支援合并。
Unlike the Get operation, which merges reconcilable differences between two versions of a file automatically and helps you merge conflicts manually, the unshelve operation does not support merges.
如果出现某些变化同另外一个变化相冲突的情况，那么合并就被认为是重要的，这是由于某个人必须决定哪一个冲突的变化应当获胜。
If it turns out that some of the changes conflict with one another, the merge is considered nontrivial, because someone must make decisions about which of the conflicting changes should prevail.
您将看到他们如何通过合并和交付来解决冲突。
You'll see how they resolve the conflict by merging and delivering.
他们将变更向下合并到自己的开发代码线，并修复任何冲突。
They merge the changes down to their development branch and fix any conflicts.
您必须在保存合并模型文件到配置管理系统中之前就解决所有的冲突。
You must merge any conflicts before you can save the merged model file in the configuration management system.
您在自己的工作之上合并建议的变更以解决冲突。
You merge the proposed changes on top of your work to resolve the conflicts.
但对于较大、较为复杂、存在冲突的更改，您可能需要参与进来，手动合并更改。
However for large, complex, and conflicting changes, you may need to help it out by merging the changes manually.
当元素层次的冲突发生时，SCM系统就不会进行自动的合并。
When conflicts at the element level occur, the SCM system can no longer merge automatically.
要解决冲突，您可以将S2和S3进行合并，并且创建新的状态s4。
To resolve the conflict you can merge S2 and S3 and create a new state S4.
在第35行上的合并成功了，因为该处没有发生任何约束冲突。
The merge becomes successful at line 35, because you don't violate any constraint there.
现在需要手动合并模型以解决该冲突。
Manual merge of the models is required now to resolve the conflicts.
一旦您进行了一些合并，并且解决了冲突，那么您就不能再悬挂变更集了，因为那样会再次引入您之前解决了的冲突。
Once you have done some merging and resolved conflicts you can no longer suspend the change set because that would re-introduce the conflicts you previously resolved.
随着冲突集大小的增长，合并变得越发具有挑战性和冗长。
Merges become challenging and lengthy as the size of the collision set grows.
一个不重要的合并是指不协调的变化并不发生冲突，并且模型合并工具能够在没有人为干涉的情况下执行合并操作。
A trivial merge is one in which the uncoordinated changes are not in conflict, and the model merge tool can perform the merges without human intervention.
在变更并不发生冲突时，就会出现平凡的合并；因此，模型合并工具会自动的合并变更。
A trivial merge occurs when changes do not conflict; therefore, the model merge tool merges the changes automatically.
当多个人交付冲突性的变更，而处理合并的人必须决定接受什么变更时，就会发生非平凡的合并。
A nontrivial merge occurs when multiple people deliver conflicting changes and the person processing the merge must determine which changes to accept.
当您接受变更并且看到不可避免的潜在冲突时（也就是，您想要向流目标交付该变更），您就知道您将需要合并。
When accepting changes and you see potential conflicts that are unavoidable (i.e. you want to deliver that change to the flow target) you know you will need to merge.
检测源更改冲突并为多个开发人员的环境提供合并。
Detects source change conflicts and provides merging for multi-developer environments.
应用推荐