Diverging code (merging conflicts).

分叉代码(合并冲突)。

youdao

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.

一旦您进行了一些合并，并且解决了冲突，那么您就不能再悬挂变更集了，因为那样会再次引入您之前解决了的冲突。

youdao

You can have code merging from the integration stream to your development stream, which involves moving labels and resolving merge conflicts.

你可以从集成流集成代码到开发流，这包括移动标签并解决合并冲突。

youdao