A formal approach to three-way merging of EMF models

Authors:
Bernhard Westfechtel
Affiliations:
University of Bayreuth, Bayreuth
Venue:
Proceedings of the 1st International Workshop on Model Comparison in Practice
Year:
2010

Citing 11
Cited 6

Structure-oriented merging of revisions of software documents

SCM '91 Proceedings of the 3rd international workshop on Software configuration management
Operation-based merging

SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
A three-way merge for XML documents

Proceedings of the 2004 ACM symposium on Document engineering
Formal Model Merging Applied to Class Diagram Integration

Electronic Notes in Theoretical Computer Science (ENTCS)
Merging models based on given correspondences

VLDB '03 Proceedings of the 29th international conference on Very large data bases - Volume 29
Consistence preserving model merge in collaborative development processes

Proceedings of the 2008 international workshop on Comparison and versioning of software models
Towards software configuration management for unified models

Proceedings of the 2008 international workshop on Comparison and versioning of software models
A Category-Theoretical Approach to the Formalisation of Version Control in MDE

FASE '09 Proceedings of the 12th International Conference on Fundamental Approaches to Software Engineering: Held as Part of the Joint European Conferences on Theory and Practice of Software, ETAPS 2009
Different models for model matching: An analysis of approaches to support model differencing

CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
Using a model merging language for reconciling model versions

ECMDA-FA'06 Proceedings of the Second European conference on Model Driven Architecture: foundations and Applications
MOFLON: a standard-compliant metamodeling framework with graph transformations

ECMDA-FA'06 Proceedings of the Second European conference on Model Driven Architecture: foundations and Applications

A formal resolution strategy for operation-based conflicts in model versioning using graph modifications

FASE'11/ETAPS'11 Proceedings of the 14th international conference on Fundamental approaches to software engineering: part of the joint European conferences on theory and practice of software
An introduction to model versioning

SFM'12 Proceedings of the 12th international conference on Formal Methods for the Design of Computer, Communication, and Software Systems: formal methods for model-driven engineering
Towards tool support for agile modeling: sketching equals modeling

Proceedings of the 2012 Extreme Modeling Workshop
Model-based tool support for consistent three-way merging of EMF models

Proceedings of the workshop on ACadeMics Tooling with Eclipse
Detection and resolution of conflicting change operations in version management of process models

Software and Systems Modeling (SoSyM)
A fundamental approach to model versioning based on graph modifications: from theory to implementation

Software and Systems Modeling (SoSyM)

Quantified Score

Hi-index	0.00

Visualization

Abstract

Inadequate version control for models significantly impedes the application of model-driven software development. In particular, sophisticated support for merging model versions is urgently needed. In this paper, we present a formal approach to three-way merging of models in the EMF framework which may be applied to instances of arbitrary Ecore models. We specify context-free and context-sensitive rules for model merging which both detect and resolve merge conflicts. Furthermore, we present a merge algorithm which produces a valid model provided it is supplied with valid input models.