SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
Design, implementation, and evaluation of a Revision Control System
ICSE '82 Proceedings of the 6th international conference on Software engineering
WHAT MAKES A GOOD DESIGN QUESTION?
ACM SIGCHI Bulletin
An infrastructure for development of object-oriented, multi-level configuration management services
Proceedings of the 27th international conference on Software engineering
Towards software configuration management for unified models
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Towards automation of iteration planning
Proceedings of the 24th ACM SIGPLAN conference companion on Object oriented programming systems languages and applications
Traceability-Based Change Awareness
MODELS '09 Proceedings of the 12th International Conference on Model Driven Engineering Languages and Systems
EMFStore: a model repository for EMF models
Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
Managing iterations with UNICASE
Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
Mirador: a synthesis of model matching strategies
Proceedings of the 1st International Workshop on Model Comparison in Practice
Operation-based conflict detection
Proceedings of the 1st International Workshop on Model Comparison in Practice
Towards a generic operation recorder for model evolution
Proceedings of the 1st International Workshop on Model Comparison in Practice
Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion
Table-driven detection and resolution of operation-based merge conflicts with mirador
ECMFA'11 Proceedings of the 7th European conference on Modelling foundations and applications
Structured merge with auto-tuning: balancing precision and performance
Proceedings of the 27th IEEE/ACM International Conference on Automated Software Engineering
Hi-index | 0.00 |
Models are in wide-spread use in the software development lifecycle and model-driven development even promotes them from an abstraction of the system to the description the system is generated from. Therefore it is increasingly important to collaborate on models. These models can range from requirements models over UML models to project management models such as schedules. Tool support for collaboration on models is therefore crucial. Traditionally Software Configuration Management (SCM) systems such as RCS [9] or Subversion [10] have supported this task for textual artifacts such as source code on the granularity of files and textual lines. They do not work well for graph-like models with many links since the granularity needed to support them is on the level of model elements and their attributes. For the design of a novel SCM system addressing these requirements it is essential to define how conflicts on models are detected and how they can be resolved. In this paper we present an approach to conflict detection and resolution on models. We employ operation-based change tracking and therefore detect conflicts based on operations. For conflict resolution we propose an integration of SCM with techniques from Rational Management to effectively resolve conflicts.