Abstract
For the versioning of code a pantheon of version control system (VCS) solutions has been realized and is successfully applied in practice. Nevertheless, when it comes to merging two different versions of one artifact, the resolution of conflicts poses a major challenge. In standard systems, the developer who performs the later commit is sole in charge of this often time-consuming, error-prone task. This commit carries the inherent danger of losing the modifications of the other developer. Recently, collaborative merge approaches for code versioning systems have been proposed to minimize this risk. In this paper we propose to apply similar techniques in the context of model versioning where the challenge of merging two versions is even more formidable due to their graph-structure and their rich semantics. In particular, modeling is used in the early phases of the software development, where a collaborative merge is beneficial to elaborate a consolidated understanding of a domain.
Access this chapter
Tax calculation will be finalised at checkout
Purchases are for personal use only
Preview
Unable to display preview. Download preview PDF.
References
Altmanninger, K., G. Kappel, A. Kusel, W. Retschitzegger, M. Seidl, W. Schwinger, and M. Wimmer (2008): ‘AMOR—Towards Adaptable Model Versioning’. In: Proc. of the 1st International Workshop on Model Co-Evolution and Consistency Management.
Barrett, S., P. Chalin, and G. Butler (2008): ‘Model Merging Falls Short of Software Engineering Needs’. In: Proc. of the 2nd Workshop on Model-Driven Software Evolution.
Bézivin, J. (2005): ‘On the Unification Power of Models’. Journal on Software and Systems Modeling, vol. 4, no. 2, pp. 171–188.
Dewan, P. and R. Hegde (2007): ‘Semi-synchronous conflict detection and resolution in asynchronous software development’. In: Proc. of the 10th European Conference on Computer-Supported Cooperative Work. pp. 159–178, Springer.
Dewan, P. and J. Riedl (1993): ‘Toward Computer-Supported Concurrent Software Engineering’. IEEE Computer, vol. 26, no. 1, pp. 17–27.
Fitzpatrick, G., P. Marshall, and A. Phillips (2006): ‘CVS integration with notification and chat: lightweight software team collaboration’. In: Proc. of the 2006 ACM Conference on Computer Supported Cooperative Work. pp. 49–58, ACM.
France, R. B. and B. Rumpe (2007): ‘Model-driven Development of Complex Software: A Research Roadmap’. In: Proc. of the 29th International Conference on Software Engineering. pp. 37–54, IEEE Computer Society.
Mens, T. (2002): ‘A State-of-the-Art Survey on Software Merging’. IEEE Transactions on Software Engineering, vol. 28, no. 5, pp. 449–462.
Author information
Authors and Affiliations
Corresponding author
Editor information
Editors and Affiliations
Rights and permissions
Copyright information
© 2009 Springer-Verlag London Limited
About this paper
Cite this paper
Brosch, P., Seidl, M., Wieland, K., Wimmer, M., Langer, P. (2009). We can work it out: Collaborative Conflict Resolution in Model Versioning. In: Wagner, I., TellioÄŸlu, H., Balka, E., Simone, C., Ciolfi, L. (eds) ECSCW 2009. Springer, London. https://doi.org/10.1007/978-1-84882-854-4_12
Download citation
DOI: https://doi.org/10.1007/978-1-84882-854-4_12
Publisher Name: Springer, London
Print ISBN: 978-1-84882-853-7
Online ISBN: 978-1-84882-854-4
eBook Packages: Computer ScienceComputer Science (R0)