Collaborative model merging

Models are important artifacts in the software development life-cycle and are often the result of a collaborative activity of multiple developers. When multiple developers modify the same model, conflicts can occur and need to be resolved by merging. Existing approaches for model merging require developers to solve all conflicts before committing. The later a developer commits the higher the probability for even more conflicts. This forces the developers to solve every conflict as soon as possible and without consulting the other developer. However, we claim that developers often need to discuss their choice of conflict resolution with another developer in case of a complex conflict, since a conflict also expresses differences in opinion about the model. In this paper we propose to allow developers to postpone a decision of a modeling conflict. We present an approach to make conflicts part of the model and represent them as first-level entities based on issue modeling from t...

• Type: Journal
• Year: 2010
• Where: OOPSLA
• Authors: Maximilian Koegel, Helmut Naughton, Jonas Helming, Markus Herrmannsdoerfer
• Keywords: Model, Multiple Developers, OOPSLA 2010, Rationale Management, Security Privacy