A flexible object merging framework
CSCW '94 Proceedings of the 1994 ACM conference on Computer supported cooperative work
Flexible conflict detection and management in collaborative applications
Proceedings of the 10th annual ACM symposium on User interface software and technology
Version models for software configuration management
ACM Computing Surveys (CSUR)
Managing inconsistent specifications: reasoning, analysis, and action
ACM Transactions on Software Engineering and Methodology (TOSEM)
ISPW '90 Proceedings of the 5th international software process workshop on Experience with software process models
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
Inconsistency Handling in Multiperspective Specifications
IEEE Transactions on Software Engineering
UML Distilled: A Brief Guide to the Standard Object Modeling Language
UML Distilled: A Brief Guide to the Standard Object Modeling Language
Towards software configuration management for unified models
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Towards odyssey-VCS 2: improvements over a UML-based version control system
Proceedings of the 2008 international workshop on Comparison and versioning of software models
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
Turning Conflicts into Collaboration
Computer Supported Cooperative Work
Hi-index | 0.00 |
Software engineering deals with the development of complex software systems which is an inherently team-based task. Therefore, version control support is needed to coordinate the teamwork and to manage parallel modifications. If conflicting modifications occur, in standard approaches the developer who detected the conflict is responsible for the conflict resolution alone and has to resolve the conflict immediately. Especially in early project phases, when software models are typically employed for brainstorming, analysis, and design purposes, such an approach bears the danger of losing important viewpoints of different stakeholders and domain engineers, resulting in a lower quality of the overall system specification. In this paper, we propose conflict-tolerant model versioning to overcome this problem. Conflicts are marked during the merge phase and are tolerated temporarily in order to resolve them later in a collaborative setting. We illustrate the proposed approach for the standardized modeling language UML and discuss how it can be integrated in current modeling tools and version control systems.