当第二个用户试图检入时，用户必须执行一个合并来解决这些差异。
When the second user tries to check in, the user must perform a merge to resolve the differences.
这种基本的差异导致两种范例的结合并不理想，不过话说回来，本来就预料到会有一些问题。
This fundamental difference results in a less-than-ideal combination of the two paradigms, but then, a few hitches are to be expected.
您可以使用工作区来再使用模型内容，执行具体的追踪性，差异(比较)内容，合并或者提取工作区之间的内容。
You can use Workspaces to reuse model content, perform detailed traceability, difference (compare) content, and merge or extract model content between Workspaces.
在对比编辑器中了解要合并的数据对象的差异之后，可以生成ddl脚本或者把修改导入XML文件。
After you decide what difference you want to merge into one of the data objects in the compare editor, you can generate a delta DDL script or export the changes to an XML file.
手动创建一个合并箭头，以指示差异被解决了。
Manually create a merge arrow to indicate that the differences are resolved.
ExamXML是一个强大的工具，用于可视地比较及合并x ML文档之间的差异。
ExamXML is a powerful tool to visually compare and merge the differences between XML documents.
环境中另一个经常使用的术语是delta，它描述了模型比较-合并编辑器中可见的差异性。
Another term that is often used in this context is delta, which describes a difference visible in a model compare-merge editor.
本系列的第2部分将讨论Git的更高级应用：合并分支、生成差异(diff)和其他常见任务。
Part 2 of this series will discuss more advanced USES of Git: merging branches, generating diffs, and other common tasks.
为了识别导入之间的变更，并管理更新，您可以导入XML文件到一个新的Rhapsody项目中，然后使用差异和合并功能。
To identify changes between imports and to manage model updates, you can import the XMI file into a new Rhapsody project and then use the differencing and merging capability.
当考虑到差异时，不管是手动的还是自动的，都会绘出一个合并箭头，并由ClearCase考虑解决的差异。
When the differences have been considered, either automatically or manually, a merge arrow is drawn and ClearCase considers the differences resolved.
当第二个用户尝试检入文件时，该用户就必须执行一次合并操作，以解决差异性问题。
When the second user tries to check in files, that user must perform a merge to resolve the differences.
一个比较合并进程会打开，显示图29中所显示的差异之处。
A compare merge session opens, showing the differences as illustrated in Figure 29.
当合并新的模型或者特性到企业模型中时，模型差异性可以被个人或者集体接受或者拒绝。
Model differences can be individually or collectively accepted or rejected when merging new model elements or features into the enterprise models.
将该服务器与我们最新合并的dpar相比较，可以看到结果中的差异(列6)甚至更显著了。
Comparing this server to our newly consolidated DPAR, you can see that the difference in the results (column 6) was even more dramatic.
事实上，有些人却认为两公司之间的差异恰恰意味着合并将是解决当前紧张局面的最佳办法。
Some people, indeed, argue that the two firms' differences mean a merger would be the best answer to the current tensions.
一般这种业务与关键数据供应商保持着密切联系。这些数据将与其他数据整合并进行统一处理，随后生成有价值的差异化的使用门槛，十分具有市场竞争力。
Often these businesses have special relationships with key data providers, that when combined with other data and processed as a whole create valuable differentiation and competitive barriers.
RationalSoftware ArchitectCompare/Merge功能使您可以比较和追踪不同的模型元素和图表视图，识别它们与合并模型之间的差异。
The Rational Software Architect Compare/Merge capability enables you to compare and track different model elements and diagram views, identify the differences between them, and merge models.
在本系列第2部分中，我将研究合并、差异生成以及一些其他Git命令。
In Part 2, I will explore merging, generating diffs, and some of the other Git commands.
通过实例计算，说明不同合并会计方法下盈利指标存在很大的差异。
Through calculating real cases, we can know that profit index is quite different under accounting methods of various mergers.
这种利用差异目前的市场价格和高买价在发生合并是否成行。
This takes advantage of the difference between present market price and the high purchase price in the event that mergers does take place.
地籍信息系统的宗地合并操作时常会失效，其原因是实际测量的宗地图形与系统要求的理想化宗地图形有一定的差异。
Sometimes the operation of merging parcel in cadastral information systems may become invalidation, since there are some gaps between surveyed parcel graph and idealization graph.
目的：观察合并糖尿病的急性胆管炎病人在手术方式选择上的差异对预后的影响。
Objective: To investigate the effect on prognosis of acute cholangitis combined with diabetes using different surgical treatments.
本研究中脑梗塞组滤过指数较冠心病组高，可能与脑梗塞组合并基础疾病比较高有关，但两组差异无显著（P＞0．05）。
The filterability indexes of cerebral infarction is higher than those with coronary heart disease but is of no significant difference (P<0. 05).
而不同类型的盘状半月板合并半月板撕裂的概率是有差异的，因此，MRI检查对临床确定治疗盘状半月板的方案很有帮助。
The occurrence of laceration is different in different types of discoid meniscus. MRI is of great help for the selection of therapy.
结果不同经济水平与不同行政级别的地区，妊娠合并心脏病的发生率有显著差异。
Results:The prevalence of pregnancy with heart disease was significant difference between different level and economic levels area.
结论：为减少抗精神病药对心血管损害及毒副作用，应针对性合理用药，注意病人的个体素质差异，避免合并或大剂量使用抗精神病药。
CONCLUSION: The use of antipsychotics must be consider individual condition and avoid administration of large dose in order to prevent lesion to cardiovascular system.
冠心病合并高尿酸血症组冠状动脉病变程度和支数与冠心病无高尿酸血症组无明显差异。
There was no obvious difference in the degree of coronary disease and number of lesion vessels.
第五部分介绍了中、美合并会计报表外币报表折算处理的差异分析；
The fifth part expresses the differences of the foreign currency conversion between the America and China.
两组患者合并各种感染的发生率和A组比较有显著性差异；
The difference between the incidence of infection of groups of Child-pugh class B, C and groups of class A was significant.
各分型间合并胫骨髁间棘骨折及腓骨近端骨折的发生率差异无显著性意义（P>0.05）。
There was no statistical difference between the type of classification and the incidence of complicated fractures of proximal fibula and intercondylar eminence of the tibia(P >0.05).
应用推荐