Conflicts as first-class entities: a UML profile for model versioning

Authors:
Petra Brosch;Horst Kargl;Philip Langer;Martina Seidl;Konrad Wieland;Manuel Wimmer;Gerti Kappel
Affiliations:
Business Informatics Group, Vienna University of Technology, Austria;SparxSystems, Austria;Department of Telecooperation, Johannes Kepler University Linz, Austria;Business Informatics Group, Vienna University of Technology, Austria;Business Informatics Group, Vienna University of Technology, Austria;Business Informatics Group, Vienna University of Technology, Austria;Business Informatics Group, Vienna University of Technology, Austria
Venue:
MODELS'10 Proceedings of the 2010 international conference on Models in software engineering
Year:
2010

Citing 14
Cited 3

Version models for software configuration management

ACM Computing Surveys (CSUR)
A State-of-the-Art Survey on Software Merging

IEEE Transactions on Software Engineering
Differences between versions of UML diagrams

Proceedings of the 9th European software engineering conference held jointly with 11th ACM SIGSOFT international symposium on Foundations of software engineering
A generic approach to supporting diagram differencing and merging for collaborative design

Proceedings of the 20th IEEE/ACM international Conference on Automated software engineering
Model-driven Development of Complex Software: A Research Roadmap

FOSE '07 2007 Future 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
Effective Software Merging in the Presence of Object-Oriented Refactorings

IEEE Transactions on Software Engineering
Managing Model Conflicts in Distributed Development

MoDELS '08 Proceedings of the 11th international conference on Model Driven Engineering Languages and Systems
Challenges in Model-Driven Software Engineering

Models in Software Engineering
An Example Is Worth a Thousand Words: Composite Operation Modeling By-Example

MODELS '09 Proceedings of the 12th International Conference on Model Driven Engineering Languages and Systems
Operation-based conflict detection

Proceedings of the 1st International Workshop on Model Comparison in Practice
Colex: a web-based collaborative conflict lexicon

Proceedings of the 1st International Workshop on Model Comparison in Practice
Towards a generic operation recorder for model evolution

Proceedings of the 1st International Workshop on Model Comparison in Practice
Conflict detection for graph transformation with negative application conditions

ICGT'06 Proceedings of the Third international conference on Graph Transformations

Towards semantics-aware merge support in optimistic model versioning

MODELS'11 Proceedings of the 2011th international conference on Models in Software Engineering
A fundamental approach to model versioning based on graph modifications: from theory to implementation

Software and Systems Modeling (SoSyM)
Specifying model changes with UMLchange to support security verification of potential evolution

Computer Standards & Interfaces

Quantified Score

Hi-index	0.00

Visualization

Abstract

The urgent demand for optimistic version control support for software models induced active research within the modeling community. Recently, several approaches have been proposed addressing the task of detecting conflicts when merging two concurrently changed versions of a model. In this context, the holistic representation and supportive visualization of detected merge conflicts pose a challenge. In this paper, we present a modeling language independent conflict model comprising all necessary information to profoundly represent merge conflicts. From this conflict model, we leverage the dynamic extension power of UML profiles by introducing a dedicated conflict profile to visually assist modelers in resolving merge conflicts of UML models. As a result, modelers may resolve conflicts in the concrete graphical syntax conducting their familiar UML editors without tool extensions.