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

This is different from other CM approaches, which require merging a set of files or manually sending a bill of materials to someone who will then list the versions included in your change.

这是有别于其它配置管理方法，其它配置管理方法需要合并一组文件，或手动地将材料单发送给某个人，然后他将会列出你的变更里所包含的版本。

youdao

Merging data (different graphs) is a simple operation that involves constructing a set of triples that includes all of the triples from the graphs.

合并数据(不同的图)是一项简单操作，只需要建立包含图中所有三元组的集合。

youdao

And he has set about breaking up and merging government bureaucracies in order to separate government from business.

ECONOMIST: China