Vienna University of Economics and Business
The urgent demand for supporting teamwork and continuous evolution of software models triggered intensive research on optimistic version control systems for models. State-of-the-art model versioning approaches primarily focus on detecting changes and conflicts between concurrently evolved versions of a model. However, techniques for conflict visualization have been hardly investigated yet. In this paper, the authors propose to support the visualization of conflicts in the concrete syntax of UML models. For this purpose, they present an approach to tentatively merge concurrently evolved versions of one model featuring all performed changes, yet keeping conformance to the UML metamodel.