Conflict Resolution in Model Versioning

Abstract

Optimistic version control systems enable globally distributed teams of developers to work together asynchronously. Every developer works on a local copy and consequently, no developer is ever detracted from working by waiting for a resource. The price for this flexibility is payed at the moment when conflicting modifications must be integrated into one consolidated version. In this paper, we discuss conflicts and their need for resolution in the context of model versioning and provide the basic concepts necessary to build a model versioning system which guides modelers through the critical consolidation phase by recommending suitable patterns.

Publication
Poster: 1st International Master Class on Model-Driven Engineering, Oslo, Norwegen; 09-30-2010 - 10-02-2010; in: “1st International Master Class on Model-Driven Engineering, Poster Session Companion”, (2010), 17 - 18
Petra Kaufmann
Mag.rer.soc.oec. Dr.rer.soc.oec.
Konrad Wieland
Dipl.-Ing. Dr.rer.soc.oec.
Gerti Kappel
Gerti Kappel
O.Univ.Prof. Dipl.-Ing. Mag. Dr.techn.