Abstract
The urgent demand for optimistic version control support for software models induced active research within the modeling community. Recently, several approaches have been proposed addressing the task of detecting conflicts when merging two concurrently changed versions of a model. In this context, the holistic representation and supportive visualization of detected merge conflicts pose a challenge.
In this paper, we present a modeling language independent conflict model comprising all necessary information to profoundly represent merge conflicts. From this conflict model, we leverage the dynamic extension power of UML profiles by introducing a dedicated conflict profile to visually assist modelers in resolving merge conflicts of UML models. As a result, modelers may resolve conflicts in the concrete graphical syntax conducting their familiar UML editors without tool extensions.
This work has been partly funded by the Austrian Federal Ministry of Transport, Innovation, and Technology and the Austrian Research Promotion Agency under grant FIT-IT-819584 and by the fFORTE WIT Program of the Vienna University of Technology and the Austrian Federal Ministry of Science and Research.
This is a preview of subscription content, log in via an institution.
Buying options
Tax calculation will be finalised at checkout
Purchases are for personal use only
Learn about institutional subscriptionsPreview
Unable to display preview. Download preview PDF.
References
Brosch, P., Kappel, G., Langer, P., Seidl, M., Wieland, K., Wimmer, M., Kargl, H.: Adaptable Model Versioning in Action. In: Modellierung 2010, pp. 221–236 (2010)
Brosch, P., Langer, P., Seidl, M., Wieland, K., Wimmer, M.: Colex: A Web-based Collaborative Conflict Lexicon. In: Proc. of the 1st Int. Workshop on Model Comparison in Practice @ TOOLS 2010, pp. 42–49. ACM, New York (2010)
Brosch, P., Langer, P., Seidl, M., Wieland, K., Wimmer, M., Kappel, G., Retschitzegger, W., Schwinger, W.: An Example Is Worth a Thousand Words: Composite Operation Modeling By-Example. In: Schürr, A., Selic, B. (eds.) MODELS 2009. LNCS, vol. 5795, pp. 271–285. Springer, Heidelberg (2009)
Brun, C., Pierantonio, A.: Model Differences in the Eclipse Modeling Framework. UPGRADE, The Europ. Journal for the Informatics Professional (2008)
Cicchetti, A., Di Ruscio, D., Pierantonio, A.: Managing Model Conflicts in Distributed Development. In: Busch, C., Ober, I., Bruel, J.-M., Uhl, A., Völter, M. (eds.) MODELS 2008. LNCS, vol. 5301, pp. 311–325. Springer, Heidelberg (2008)
Conradi, R., Westfechtel, B.: Version Models for Software Configuration Management. ACM Computing Surveys 30(2), 232–282 (1998)
Dig, D., Manzoor, K., Johnson, R.E., Nguyen, T.N.: Effective Software Merging in the Presence of Object-Oriented Refactorings. IEEE Transactions on Software Engineering 34(3), 321–335 (2008)
France, R., Rumpe, B.: Model-driven Development of Complex Software: A Research Roadmap. In: Future of Software Engineering, pp. 37–54. IEEE, Los Alamitos (2007)
Herrmannsdoerfer, M., Kögel, M.: Towards a Generic Operation Recorder for Model Evolution. In: Proc. of the 1st Int. Workshop on Model Comparison in Practice @ TOOLS 2010, pp. 76–81. ACM, New York (2010)
Kögel, M., Herrmannsdoerfer, M., von Wesendonk, O., Helming, J.: Operation-based Conflict Detection. In: Proc. of the 1st Int. Workshop on Model Comparison in Practice @ TOOLS 2010, pp. 21–30. ACM, New York (2010)
Lambers, L., Ehrig, H., Orejas, F.: Conflict Detection for Graph Transformation with Negative Application Conditions. In: Corradini, A., Ehrig, H., Montanari, U., Ribeiro, L., Rozenberg, G. (eds.) ICGT 2006. LNCS, vol. 4178, pp. 61–76. Springer, Heidelberg (2006)
Mehra, A., Grundy, J., Hosking, J.: A Generic Approach to Supporting Diagram Differencing and Merging for Collaborative Design. In: Proc. of the 20th Int. Conference on Automated Software Engineering, pp. 204–213. ACM, New York (2005)
Mens, T.: A State-of-the-Art Survey on Software Merging. IEEE Transactions on Software Engineering 28(5), 449–462 (2002)
Murta, L., Corrêa, C., Prudêncio, J.G., Werner, C.: Towards Odyssey-VCS 2: Improvements over a UML-based Version Control System. In: Proc. of the 2nd Int. Workshop on Comparison and Versioning of Software Models @ ICSE 2008(2008)
Ohst, D., Welle, M., Kelter, U.: Differences between Versions of UML Diagrams. In: Proc. of the 9th Europ. Software Engineering Conf., pp. 227–236. ACM, New York (2003)
Schneider, C., Zündorf, A., Niere, J.: CoObRA—A Small Step for Development Tools to Collaborative Environments. In: Proc. of the Workshop on Directions in Software Engineering Environments @ ICSE 2004 (2004)
Van Der Straeten, R., Mens, T., Van Baelen, S.: Challenges in Model-Driven Software Engineering. In: Chaudron, M.R.V. (ed.) MODELS 2008. LNCS, vol. 5421, pp. 35–47. Springer, Heidelberg (2009)
Author information
Authors and Affiliations
Editor information
Editors and Affiliations
Rights and permissions
Copyright information
© 2011 Springer-Verlag Berlin Heidelberg
About this paper
Cite this paper
Brosch, P. et al. (2011). Conflicts as First-Class Entities: A UML Profile for Model Versioning. In: Dingel, J., Solberg, A. (eds) Models in Software Engineering. MODELS 2010. Lecture Notes in Computer Science, vol 6627. Springer, Berlin, Heidelberg. https://doi.org/10.1007/978-3-642-21210-9_18
Download citation
DOI: https://doi.org/10.1007/978-3-642-21210-9_18
Publisher Name: Springer, Berlin, Heidelberg
Print ISBN: 978-3-642-21209-3
Online ISBN: 978-3-642-21210-9
eBook Packages: Computer ScienceComputer Science (R0)