但是如果有冲突性的变更存在，那么您就必须通过选择接受变更的模型的版本，来手动解决剩余的冲突问题。
But if there are conflicting changes, you must manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
如果你有产生冲突的变化，那么你必须手工解决剩下的冲突，选择接受哪一个版本的模型的变化。
If you have conflicting changes, you must then manually resolve the remaining conflicts by selecting a version of a model from which to accept changes.
冲突必须在很大的深度范围内得到检查和解决，尤其是在范例模型方面。
Conflicts must be examined in great depth and are generally resolved in favor of the exemplar models.
您必须在保存合并模型文件到配置管理系统中之前就解决所有的冲突。
You must merge any conflicts before you can save the merged model file in the configuration management system.
现在需要手动合并模型以解决该冲突。
Manual merge of the models is required now to resolve the conflicts.
这些冲突的解决需要更多的努力，主要是因为我们要用XP和非xp的方法收集需求，然后在两种模型中进行映射。
These conflicting expectations required additional effort, primarily because we had to gather requirements using both xp and non-XP methods, and then map between the two models.
解决模型中的冲突，以及Compare - and -Merge部分中的片段，然后为每一个uml模型指定合并部分(各自的片段)。
Resolves conflicts in models and fragments in Compare-and-Merge sessions, and then commits the merge session for each UML model (respective fragment).
在你解决剩下的冲突之后，你可以保存合并后的模型，并关闭合并编辑器。
After you resolve the remaining conflicts, you can save the merged model and close the merge editor.
下面是上述3个冲突解决选项的示例，这些示例对现有安全模型和导入安全模型的假设如下。
Examples of the three options for resolving collisions appear below. The examples assume the following for the existing and incoming security models.
这种特性对于简化编程模型、提供多语言集成、实现类型安全和解决版本冲突等许多方面都具有重要的意义。
The self-description is the key to program model simplification, multi-language integration, type safety and solving version conflict.
本文对IRBAC模型下的一些冲突和域穿梭给出了解决的方案。
This paper proposed the solution for role conflicts and domain crossing in IRBAC model.
叙述了系统的主要模型：空域流量预测模块，空域状态识别模块和冲突解决方案产生模块的实现过程。
The three major modules are explained including airspace flow prediction, airspace status identification and conflict solution, which uses the technique of neural network to realize.
在该模型中，引入一种加锁检测机制，通过该机制可以确定哪些冲突事务可以通过降低加锁粒度来解决冲突。
At this model, a locking checking scheme is introduced, and some conflicts can be solved by decreasing locking granularity with this scheme.
建立了阅读器网络的图模型，阐述了阅读器网络拓扑结构固定和可随机改变情况下对解决阅读器冲突问题的不同要求。
The article introduces the graph model of reader network, and formulates requirement of the solution to reader collision when topology of the reader network is fixable or variable randomly.
目前，研究者们已经对冲突解决的模型、影响因素及冲突解决策略等方面进行了大量研究。
At present, many researches on the model of resolving peer conflicts, the influential factors as well as the resolving strategy have been done by a lot of scholars.
本文将协同进化思想应用到冲突分析中，建立相应的冲突分析模型，给出模型求解算法，能有效地解决冲突分析中存在的不足。
This paper introduces the idea of synergetic evolution into conflict analysis, which efficiently solves the problem of multiple-players and multiple-goals.
本文将协同进化思想应用到冲突分析中，建立相应的冲突分析模型，给出模型求解算法，能有效地解决冲突分析中存在的不足。
This paper introduces the idea of synergetic evolution into conflict analysis, which efficiently solves the problem of multiple-players and multiple-goals.
应用推荐