Model-based tool support for consistent three-way merging of EMF models

Authors:
Felix Schwägerl;Sabrina Uhrig;Bernhard Westfechtel
Affiliations:
University of Bayreuth, Bayreuth, Germany;University of Bayreuth, Bayreuth, Germany;University of Bayreuth, Bayreuth, Germany
Venue:
Proceedings of the workshop on ACadeMics Tooling with Eclipse
Year:
2013

Citing 16
Cited 0

Algorithms in Java, Part 5: Graph Algorithms

Algorithms in Java, Part 5: Graph Algorithms
A three-way merge for XML documents

Proceedings of the 2004 ACM symposium on Document engineering
EMF: Eclipse Modeling Framework 2.0

EMF: Eclipse Modeling Framework 2.0
Formal Model Merging Applied to Class Diagram Integration

Electronic Notes in Theoretical Computer Science (ENTCS)
Google Guice: Agile Lightweight Dependency Injection Framework (Firstpress)

Google Guice: Agile Lightweight Dependency Injection Framework (Firstpress)
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
Requirements for Practical Model Merge --- An Industrial Perspective

MODELS '09 Proceedings of the 12th International Conference on Model Driven Engineering Languages and Systems
EMFStore: a model repository for EMF models

Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
Proceedings of the 1st International Workshop on Model Comparison in Practice

International Workshop on Model Comparison in Practice
Operation-based conflict detection

Proceedings of the 1st International Workshop on Model Comparison in Practice
A formal approach to three-way merging of EMF models

Proceedings of the 1st International Workshop on Model Comparison in Practice
Conflict detection for model versioning based on graph modifications

ICGT'10 Proceedings of the 5th international conference on Graph transformations
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
Merging models with the epsilon merging language (EML)

MoDELS'06 Proceedings of the 9th international conference on Model Driven Engineering Languages and Systems
XCC: change control of XML documents

Computer Science - Research and Development
Ensuring well-formedness of configured domain models in model-driven product lines based on negative variability

FOSD '12 Proceedings of the 4th International Workshop on Feature-Oriented Software Development

Quantified Score

Hi-index	0.00

Visualization

Abstract

Inadequate version control has been identified as a major obstacle to the application of model-driven software engineering. In particular, sophisticated support for merging model versions is urgently needed. We present a tool for merging of EMF models which may be applied to instances of arbitrary Ecore models. The tool advances the state of the art by guaranteeing a consistent merge result. Furthermore, it detects and resolves not only context-free, but also context-sensitive conflicts. Our merge tool is model-based; it relies on EMF for its implementation. Initial experiences gained from its application confirm that the merge tool operates both accurately and efficiently.