SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
Design patterns: elements of reusable object-oriented software
Design patterns: elements of reusable object-oriented software
Version models for software configuration management
ACM Computing Surveys (CSUR)
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
An Efficient Version Model of Software Diagrams
APSEC '98 Proceedings of the Fifth Asia Pacific Software Engineering Conference
Design, implementation, and evaluation of a Revision Control System
ICSE '82 Proceedings of the 6th international conference on Software engineering
A Fine-Grained Version and Confguration Model in Analysis and Design
ICSM '02 Proceedings of the International Conference on Software Maintenance (ICSM'02)
An infrastructure for development of object-oriented, multi-level configuration management services
Proceedings of the 27th international conference on Software engineering
Odyssey-VCS: a flexible version control system for UML model elements
Proceedings of the 12th international workshop on Software configuration management
Meta-Modeling Based Version Control System for Software Diagrams
IEICE - Transactions on Information and Systems
EMF: Eclipse Modeling Framework 2.0
EMF: Eclipse Modeling Framework 2.0
Refactoring-Aware Configuration Management for Object-Oriented Programs
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Consistence preserving model merge in collaborative development processes
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Towards software configuration management for unified models
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Operation-based conflict detection and resolution
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
The operation recorder: specifying model refactorings by-example
Proceedings of the 24th ACM SIGPLAN conference companion on Object oriented programming systems languages and applications
Conflicts as first-class entities: a UML profile for model versioning
MODELS'10 Proceedings of the 2010 international conference on Models in software engineering
An introduction to model versioning
SFM'12 Proceedings of the 12th international conference on Formal Methods for the Design of Computer, Communication, and Software Systems: formal methods for model-driven engineering
Model-based tool support for consistent three-way merging of EMF models
Proceedings of the workshop on ACadeMics Tooling with Eclipse
Detection and resolution of conflicting change operations in version management of process models
Software and Systems Modeling (SoSyM)
Hi-index | 0.00 |
In recent years, models are increasingly used throughout the entire lifecycle in software engineering projects. In effect, the need for collaboration and for management of change on these models emerged. Traditionally, Software Configuration Management (SCM) systems are employed to facilitate collaboration on software engineering artifacts and to control change to these artifacts. For scalability and to support offline operation, most of these systems employ optimistic concurrency control and therefore require methods to detect concurrent change---also known as conflict detection. However, many researchers have shown that existing approaches for SCM systems do not work well on graph-like models, since they are geared towards textual artifacts and do not take the graph structure of models into account. The approaches for conflict detection in these systems show many false positives, since they require a merge every time the same configuration item --- in this case the same file --- is changed. In this paper, we propose operation-based conflict detection, which detects conflicts directly on the operations that change the model. We compare operation-based conflict detection to file-based conflict detection in a multi-case study and show that operation-based conflict detection results in less conflicts and therefore requires fewer merges.