Thumbnail Image

Conflict Detection for Model Versioning Based on Graph Modifications: Long Version

Taentzer, Gabriele; Ermel, Claudia; Langer, Philip; Wimmer, Manuel

Forschungsberichte der Fakultät IV - Elektrotechnik und Informatik / Technische Universität Berlin

In model-driven engineering, models are primary artifacts and can evolve heavily during their life cycle. Therefore, versioning of models is a key technique which has to be offered by an integrated development environment for model-driven engineering. In contrast to text-based versioning systems we present an approach which takes abstract syntax structures in model states and operational features into account. Considering the abstract syntax of models as graphs, we define model revisions as graph modifications which are not necessarily rule-based. Building up on the DPO approach to graph transformations, we define two different kinds of conflict detection: (1) the check for operation-based conflicts, and (2) the check for state-based conflicts on results of merged graph modifications.