Conflicts as First-Class Entities: A UML Profile for Model Versioning

  • Petra Brosch
  • Horst Kargl
  • Philip Langer
  • Martina Seidl
  • Konrad Wieland
  • Manuel Wimmer
  • Gerti Kappel
Conference paper

DOI: 10.1007/978-3-642-21210-9_18

Part of the Lecture Notes in Computer Science book series (LNCS, volume 6627)
Cite this paper as:
Brosch P. et al. (2011) Conflicts as First-Class Entities: A UML Profile for Model Versioning. In: Dingel J., Solberg A. (eds) Models in Software Engineering. MODELS 2010. Lecture Notes in Computer Science, vol 6627. Springer, Berlin, Heidelberg

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.

Keywords

model versioning conflict visualization UML profile 

Preview

Unable to display preview. Download preview PDF.

Unable to display preview. Download preview PDF.

Copyright information

© Springer-Verlag Berlin Heidelberg 2011

Authors and Affiliations

  • Petra Brosch
    • 1
  • Horst Kargl
    • 3
  • Philip Langer
    • 2
  • Martina Seidl
    • 1
  • Konrad Wieland
    • 1
  • Manuel Wimmer
    • 1
  • Gerti Kappel
    • 1
  1. 1.Business Informatics GroupVienna University of TechnologyAustria
  2. 2.Department of TelecooperationJohannes Kepler University LinzAustria
  3. 3.SparxSystemsAustria

Personalised recommendations