Adaptable Model Versioning in Action

P. Brosch, G. Kappel, M. Seidl, K. Wieland, M. Wimmer, H. Kargl, P. Langer:
"Adaptable Model Versioning in Action";
Vortrag: GI, Klagenfurt; 24.03.2010 - 26.03.2010; in:"Modellierung 2010", GI, LNI 161 (2010), ISBN: 978-3-88579-255-0; S. 221 - 236.

[ Publication Database ]


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.