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.
一旦您进行了一些合并，并且解决了冲突，那么您就不能再悬挂变更集了，因为那样会再次引入您之前解决了的冲突。
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.
这是有别于其它配置管理方法，其它配置管理方法需要合并一组文件，或手动地将材料单发送给某个人，然后他将会列出你的变更里所包含的版本。
Merging data (different graphs) is a simple operation that involves constructing a set of triples that includes all of the triples from the graphs.
合并数据(不同的图)是一项简单操作，只需要建立包含图中所有三元组的集合。
Previously, dissent had been crushed, most visibly when Ms Fiorina set about merging HP with Compaq.
在此之前，费奥·瑞纳着手惠普和康柏的合并时，很明显所有异议都遭到压制。
Then, the empirical distributing probability model of merging spots was set up by using regression techniques and statistical methods.
运用回归技术和统计方法，建立了加速车道合流点分布概率的实测经验模型。
Fast tree-based redistancing for level set computations may resolve complex topology, intersection, merging during interface moving.
基于树型结构的快速等距计算方法可以有效地解决等距过程中发生的拓扑、自交、同化等现象。
In technique, it is classified by net architecture and information merging manner. A set of netting principle of surveillance radar is given, and then surveillance radar net …
提出了一套地面对空监视雷达网组网原则，在此基础上构建出地面对空监视雷达网结构体系和战技效能指标体系。
In technique, it is classified by net architecture and information merging manner. A set of netting principle of surveillance radar is given, and then surveillance radar net …
提出了一套地面对空监视雷达网组网原则，在此基础上构建出地面对空监视雷达网结构体系和战技效能指标体系。
应用推荐