合并冲突性的更改：非逻辑性的合并。
悲剧的主要特点之一就是冲突性。
这些决定具有模糊、不确定与冲突性。
两个用户对相同的模型元素和图表做出冲突性的变更。
The two users make conflicting changes to the same model elements and diagrams.
利益和价值的多元性和冲突性是权利冲突的根据。
The variety and conflict of interest and value are the basis of the conflict of rights.
因为User1并没有更改模型，所以更改就不是冲突性的了。
As User1 has not yet modified the models, the changes will be non-conflicting.
要处理这个问题，最简单的方法是设计数据库以避免冲突性更新。
The easiest way to handle this problem is to design the database to avoid conflicting updates.
该地区的最具冲突性的选举将于十一月在尼加拉瓜举行。
The region's most conflictive election will come in Nicaragua in November.
节目从话题的选择——冲突性，树立了节目的整体风格。
From the choice of topics - conflicts, set the overall style of the show.
在最新的企业模型和最新的项目模型之间，可能会有冲突性的变更发生。
There may be conflicting changes between the latest enterprise models and the latest project models.
法律义务冲突具有法律性、客观性、冲突性和身份性等特征。
There are some characters of conflict in legal duties, such as legality, objectivity, nature of conflict, pending nature.
现代型的家庭产生了多元性、本位性、功利性、冲突性的家庭道德。
The modern family has produced pluralism, standard, utility, conflict family morals.
公司章程与公司法关系的合理框架应是“融合互动性和矛盾冲突性”。
A reasonable framework for the relationship between the two is supposed to be "in interaction for combination and in conflict for contradiction".
当多个人交付冲突性的变更，而处理合并的人必须决定接受什么变更时，就会发生非平凡的合并。
A nontrivial merge occurs when multiple people deliver conflicting changes and the person processing the merge must determine which changes to accept.
分析表明，会话双方的权势关系是制约说话者选择冲突性话语回应策略的重要语境因素；
The analysis shows that the power relation between the interlocutors is an essential contextual factor that constrains the speaker' s options of response strategies.
公正与效率两者是对立统一关系，在交通事故处理中主要表现为：一致性、冲突性、互动性。
The relations of equity and efficiency are contrary and united, that is forming say : they bear accordance, collision and interplay.
但是如果有冲突性的变更存在，那么您就必须通过选择接受变更的模型的版本，来手动解决剩余的冲突问题。
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.
如果您有冲突性的变更，那么您就不能完成提交操作，除非您在CompareMerge对话框中解决了冲突。
If you have conflicting changes, you will not be able to finish the deliver session unless you resolve conflicts in the Compare Merge dialog.
近三个小时的演出之间，只安排一次中场休息，但这部简单又突出的作品仍然在舞台上保持着高度的戏剧冲突性。
With just one intermission, it lasted nearly three hours. Yet it held the stage with mostly sure dramatic pacing in this simple, striking production.
这甚至能够在我们开始探讨这些愿景的可行性和冲突性之前，帮助我们了解到该地区未来可能出现的不同思潮。
This should be a tool to illustrate all the different thoughts about this future part of the city before we even start to judge and negotiate these desires in terms of feasibility and contradictions.
方案之间的相似相异性、属性的重要性、属性之间的冲突性以及折中解的敏感性等性质可以简便、直观的显示出来。
Furthermore, the resemblance and dissimilarity between alternatives, weightiness and conflict between attributes, and the sensitivity of the result are also indicated briefly and directly.
人格五因素中的情绪性、外向性、开放性、谨慎性和师生关系中的冲突性对青少年的心理健康水平均有显著预测效应。
Emotionality, extroversion, openness, cautiousness dimensions of Five-Factor personality and conflict dimensions of teacher-student relations can significantly predict adolescents' mental health.
提出了现代竞技体育成为体育新闻报道主体的主要原因：现代竞技体育的竞争性特点迎合了体育新闻冲突性的价值要求；
Then the reason to why modern sports and athletics can be the principal part of the reports of sports news has been set forward.
企业公众舆论冲突是指企业生产经营活动和传播行为可能导致的意见冲突，即对于企业不利的社会舆论以及冲突性的公众行为。
Public opinion conflicts are referred to the public opinion and public verbal actions unfavorable to an enterprise, which even may trigger some kinds of crisis under certain circumstances.
CompareandMergeGraphical Merge将会为模型启动.emx和片段.efx文件拥有冲突性的变更。
Compare and Merge Graphical Merge will launch for models (.emx) and fragments (.efx) files that have conflicting changes.
CompareandMergeGraphical Merge将会为模型启动.emx和片段.efx文件拥有冲突性的变更。
Compare and Merge Graphical Merge will launch for models (.emx) and fragments (.efx) files that have conflicting changes.
应用推荐