<div class="csl-bib-body">
<div class="csl-entry">Brosch, P., Kargl, H., Langer, P., Seidl, M., Wieland, K., Wimmer, M., & Kappel, G. (2011). Conflicts as First-Class Entities: A UML Profile for Model Versioning. In J. Dingel & A. Solberg (Eds.), <i>Models in Software Engineering: Workshops and Symposia at MoDELS 2010, Olso, Norway, October 3-8, 2010, Reports and Revised Selected Papers</i> (pp. 184–193). Lecture Notes in Computer Science Volume 6627. https://doi.org/10.1007/978-3-642-21210-9_18</div>
</div>
-
dc.identifier.isbn
9783642212093
-
dc.identifier.isbn
9783642212109
-
dc.identifier.uri
http://hdl.handle.net/20.500.12708/53236
-
dc.description.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.
en
dc.language.iso
en
-
dc.publisher
Lecture Notes in Computer Science Volume 6627
-
dc.relation.ispartofseries
Lecture Notes in Computer Science
-
dc.title
Conflicts as First-Class Entities: A UML Profile for Model Versioning
en
dc.type
Konferenzbeitrag
de
dc.type
Inproceedings
en
dc.contributor.editoraffiliation
Queen's University
-
dc.relation.isbn
978-3-642-21209-3
-
dc.relation.doi
10.1007/978-3-642-21210-9
-
dc.relation.issn
0302-9743
-
dc.description.startpage
184
-
dc.description.endpage
193
-
dc.type.category
Full-Paper Contribution
-
dc.relation.eissn
1611-3349
-
dc.publisher.place
Springer
-
tuw.booktitle
Models in Software Engineering: Workshops and Symposia at MoDELS 2010, Olso, Norway, October 3-8, 2010, Reports and Revised Selected Papers
