Global Patent Index - EP 2487582 A1

EP 2487582 A1 20120815 - Systems and/or methods for identifying and resolving complex model merge conflicts based on atomic merge conflicts

Title (en)

Systems and/or methods for identifying and resolving complex model merge conflicts based on atomic merge conflicts

Title (de)

Systeme und/oder Verfahren zur Identifizierung und Lösung von komplizierten Modellübergangskonflikten basierend auf atomaren Verschmelzungskonflikten

Title (fr)

Systèmes et/ou procédés pour identifier et résoudre des conflits de modèle complexes basés sur des conflits de fusion atomique

Publication

EP 2487582 A1 20120815 (EN)

Application

EP 11154122 A 20110211

Priority

US 201113024646 A 20110210

Abstract (en)

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.

IPC 8 full level

G06F 9/44 (2006.01)

CPC (source: EP US)

G06F 8/71 (2013.01 - EP US)

Citation (applicant)

US 7125508 P 20080418

Citation (search report)

Designated contracting state (EPC)

AL AT BE BG CH CY CZ DE DK EE ES FI FR GB GR HR HU IE IS IT LI LT LU LV MC MK MT NL NO PL PT RO RS SE SI SK SM TR

Designated extension state (EPC)

BA ME

DOCDB simple family (publication)

EP 2487582 A1 20120815; CN 102968332 A 20130313; US 2012210294 A1 20120816; US 9128804 B2 20150908

DOCDB simple family (application)

EP 11154122 A 20110211; CN 201210030834 A 20120210; US 201113024646 A 20110210