Models in Conflict - A Semantically Enhanced Version Control System for Models

For a widespread success of the model-driven paradigm, appropriate tools such as "Version Control Systems" (VCS) allowing for consistency maintenance between concurrently edited model versions are required to adequately support a model-based development process. Initial attempts for graph-based versioning of model artifacts are either tightly coupled to the modeling environment, not flexible with respect to the used modeling language or cannot interpret the model's semantics. On basis of those characteristics, the goal of the outlined thesis presented in this paper is to provide mechanisms to detect conflicting modifications between parallel edited model versions more accurately. By reducing falsely indicated conflicts and by finding additional semantic conflicts, the resolution process can be simplified by means of appropriate techniques for comparison, conflict detection, conflict resolution and merge.