首页>
外国专利>
Systems and/or methods for identifying and resolving complex model merge conflicts based on atomic merge conflicts
Systems and/or methods for identifying and resolving complex model merge conflicts based on atomic merge conflicts
展开▼
机译:用于基于原子合并冲突来识别和解决复杂模型合并冲突的系统和/或方法
展开▼
页面导航
摘要
著录项
相似文献
摘要
Certain example embodiments described herein relate to interactive model merging systems and/or methods and, more particularly, to using basic information obtained during merging to help a user resolve high-level merge conflicts. In certain example embodiments, instead of leaving it to the user to resolve the merge conflicts on the level of the atomic elements (e.g., objects and connections with a non-empty merge state), the recognition of high-level merge conflicts may help capture the semantics of the differences between the models being merged on a larger scale (e.g., covering a possibly very large number of model elements in one conflict) and/or also may generally help allow the user to resolve them easily and quickly within a reduced number of operation. The high-level merge conflicts may be resolvable at their high levels or decomposed and resolved at a lower level depending, in part, on the type of conflict involved.
展开▼