Diverging code (merging 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.
一旦您进行了一些合并，并且解决了冲突，那么您就不能再悬挂变更集了，因为那样会再次引入您之前解决了的冲突。
You can have code merging from the integration stream to your development stream, which involves moving labels and resolving merge conflicts.
你可以从集成流集成代码到开发流，这包括移动标签并解决合并冲突。
Detects source change conflicts and provides merging for multi-developer environments.
检测源更改冲突并为多个开发人员的环境提供合并。
Use a configuration management system such as ClearCase or CVS that can synchronize the whole workspace and allow merging of individual Fragments when rare conflicts occur at that level.
使用一个配置管理系统，例如ClearCase或者CVS，它们能够同步整个工作区，并且允许当那个层上发生冲突时(尽管可能性很小)对个体的片断进行合并。
The cultural conflicts existing in the merging process of enterprises are embodied as value view, managing idea and managing style.
企业并购过程中存在着文化冲突，具体表现在价值观念、经营理念、管理风格方面。
The following example attempts to resolve all conflicts by automatically merging the changes.
下面的示例尝试通过自动合并更改来解决所有冲突。
The merging and conflicts of the two cultures are reflected in their literary works.
在他们的文学作品中，既有文化的合流，又从不缺乏因撞击引起的种种问题与困扰。
The merging and conflicts of the two cultures are reflected in their literary works.
在他们的文学作品中，既有文化的合流，又从不缺乏因撞击引起的种种问题与困扰。
应用推荐