Gesellschaft für Informatik e.V.

Lecture Notes in Informatics


Modellierung 2010 P-161, 221-236 (2010).

Gesellschaft für Informatik, Bonn
2010


Copyright © Gesellschaft für Informatik, Bonn

Contents

Adaptable Model Versioning in Action

Petra Brosch , Gerti Kappel , Martina Seidl , Konrad Wieland , Manuel Wimmer , Horst Kargl and Philip Langer

Abstract


In optimistic versioning, multiple developers are allowed to modify an artifact at the same time. On the one hand this approach increases productivity as the development process is never stalled due to locks on an artifact. On the other hand conflicts may arise when it comes to merging the different modifications into one consolidated version. In general, the resolution of such conflicts is not only cumbersome, but also error-prone. Especially if the artifacts under version control are models, little support is provided by standard versioning systems. In this paper we present the enhanced versioning process of the model versioning system AMOR. We show how AMOR is configured in order to obtain a precise conflict report which allows the recommendation of automatically executable resolution patterns. The user of AMOR chooses either one of the recommendations or performs manual resolution. The manual resolution may be in collaboration with other developers and allows to infer new resolution patterns which may be applied in similar situations.


Full Text: PDF

Gesellschaft für Informatik, Bonn
ISBN 978-3-88579-255-0


Last changed 04.10.2013 18:30:34