Abstract

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, we propose to support the visualization of conflicts in the concrete syntax of UML models. For this purpose, we present an approach to tentatively merge concurrently evolved versions of one model featuring all performed changes, yet keeping conformance to the UML metamodel. Changes and conflicts are visualized in this tentatively merged model without requiring any editor extensions. Instead, we employ the powerful profile mechanism of UML to enable modelers to resolve conflicts within their favorite UML editor.

Talk to us

Join us for a 30 min session where you can share your feedback and ask us any queries you have

Schedule a call

Disclaimer: All third-party content on this website/platform is and will remain the property of their respective owners and is provided on "as is" basis without any warranties, express or implied. Use of third-party content does not indicate any affiliation, sponsorship with or endorsement by them. Any references to third-party content is to identify the corresponding services and shall be considered fair use under The CopyrightLaw.