History-based merging of models

Authors:
Maik Schmidt;Sven Wenzel;Timo Kehrer;Udo Kelter
Affiliations:
Software Engineering Group, University of Siegen, Germany;Software Engineering Group, University of Siegen, Germany;Software Engineering Group, University of Siegen, Germany;Software Engineering Group, University of Siegen, Germany
Venue:
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
Year:
2009

Citing 6
Cited 3

Operation-based merging

SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
A State-of-the-Art Survey on Software Merging

IEEE Transactions on Software Engineering
Difference computation of large models

Proceedings of the the 6th joint meeting of the European software engineering conference and the ACM SIGSOFT symposium on The foundations of software engineering
Towards odyssey-VCS 2: improvements over a UML-based version control system

Proceedings of the 2008 international workshop on Comparison and versioning of software models
Diff and merge support for model based development

Proceedings of the 2008 international workshop on Comparison and versioning of software models
Scalable visualization of model differences

Proceedings of the 2008 international workshop on Comparison and versioning of software models

Mirador: a synthesis of model matching strategies

Proceedings of the 1st International Workshop on Model Comparison in Practice
Table-driven detection and resolution of operation-based merge conflicts with mirador

ECMFA'11 Proceedings of the 7th European conference on Modelling foundations and applications
Search-based model merging

Proceedings of the 15th annual conference on Genetic and evolutionary computation

Quantified Score

Hi-index	0.00

Visualization

Abstract

Model-driven development in collaborative teams requires services for merging models. Such services should have the same quality as one is used to for source code. The constraints which are relevant in model driven engineering imply that the merging of models must be implemented differently than merging of texts. Based on the analysis of these constraints, we present an approach for merging models that attains a high level of consistency of the merged models and minimizes the loss of effort due to conflict resolution.