A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
Consistency management with repair actions
Proceedings of the 25th International Conference on Software Engineering
Parallel Changes: Detecting Semantic Interferences
COMPSAC '05 Proceedings of the 29th Annual International Computer Software and Applications Conference - Volume 01
Weaving models in conflict detection specifications
Proceedings of the 2007 ACM symposium on Applied computing
Fixing Inconsistencies in UML Design Models
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Collaboration in Software Engineering: A Roadmap
FOSE '07 2007 Future of Software Engineering
Merging models based on given correspondences
VLDB '03 Proceedings of the 29th international conference on Very large data bases - Volume 29
Aspect-oriented software development
Aspect-oriented software development
Automating Co-evolution in Model-Driven Engineering
EDOC '08 Proceedings of the 2008 12th International IEEE Enterprise Distributed Object Computing Conference
Merging models with the epsilon merging language (EML)
MoDELS'06 Proceedings of the 9th international conference on Model Driven Engineering Languages and Systems
A graphical notation to specify model queries for MDA transformations on UML models
MDAFA'03 Proceedings of the 2003 European conference on Model Driven Architecture: foundations and Applications
MoDELS'05 Proceedings of the 2005 international conference on Satellite Events at the 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
A canonical scheme for model composition
ECMDA-FA'06 Proceedings of the Second European conference on Model Driven Architecture: foundations and Applications
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
Dependent and Conflicting Change Operations of Process Models
ECMDA-FA '09 Proceedings of the 5th European Conference on Model Driven Architecture - Foundations and Applications
Supporting Parallel Updates with Bidirectional Model Transformations
ICMT '09 Proceedings of the 2nd International Conference on Theory and Practice of Model Transformations
APCCM '09 Proceedings of the Sixth Asia-Pacific Conference on Conceptual Modeling - Volume 96
Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion
A recommender for conflict resolution support in optimistic model versioning
Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion
Precise detection of conflicting change operations using process model terms
MODELS'10 Proceedings of the 13th international conference on Model driven engineering languages and systems: Part II
Techniques for merging views of software processes
Graph transformations and model-driven engineering
On the concurrent versioning of metamodels and models: challenges and possible solutions
Proceedings of the 2nd International Workshop on Model Comparison in Practice
Conflicts as first-class entities: a UML profile for model versioning
MODELS'10 Proceedings of the 2010 international conference on Models in software engineering
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
Dynamic computation of change operations in version management of business process models
ECMFA'10 Proceedings of the 6th European conference on Modelling Foundations and Applications
Towards semantics-aware merge support in optimistic model versioning
MODELS'11 Proceedings of the 2011th international conference on Models in Software Engineering
ICMT'12 Proceedings of the 5th international conference on Theory and Practice of Model Transformations
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
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
Bottom-up meta-modelling: an interactive approach
MODELS'12 Proceedings of the 15th international conference on Model Driven Engineering Languages and Systems
Synchronizing concurrent model updates based on bidirectional transformation
Software and Systems Modeling (SoSyM)
Detection and resolution of conflicting change operations in version management of process models
Software and Systems Modeling (SoSyM)
Software and Systems Modeling (SoSyM)
| Hi-index | 0.00 |
The growing complexity of current software systems naturally conveyed their development toward incremental and distributed approaches to speed up the process. Several developers update the same artefact operating concurrent manipulations which need to be coherently combined. The interaction among those changes inevitably involves conflicts which must be detected and reconciled.This paper proposes a domain specific language able to define and manage conflicts caused by cooperative updates over the same model elements. The approach relies on a model-based representation of model differences and enables the specification and the detection of both syntactical and semantic conflicts.