Skip to main content

Conflict management techniques for model merging: a systematic mapping review

Software and Systems Modeling (2022)Cite this article

Abstract

Model merging conflicts occur when different stakeholders aim to integrate their contradicting changes that are applied concurrently to update software models. We conduct an extensive systematic mapping study on conflict management techniques and relevant collaboration attributes to the versioning and merging models from 2001 to the middle of 2021. This study follows the standard guidelines within the software engineering domain. We analyzed a total of 105 articles extracted from an initial pool of more than 1800 articles to infer a taxonomy for conflict management techniques. We use this taxonomy to classify existing approaches to understand characteristics, shortcomings, and challenges on conflict management techniques in merging models. It also provides a solid foundation for future work in this area. We show that syntactic conflicts are the most studied type and that the top three popular conflict detection techniques are constraint violation, change overlapping, and pattern matching. We observe the lack of a comprehensive state-of-the-art comparison between academic or industrial tools, as well as the need for real-world case studies. Finally, we show that recent trends have focused on online collaboration, where teams of stakeholders work on large-scale models.

This is a preview of subscription content, access via your institution.

Access options

Buy single article

Instant access to the full article PDF.

USD 39.95

Price excludes VAT (USA)
Tax calculation will be finalised during checkout.

Fig. 1
Fig. 2
Fig. 3
Fig. 4
Fig. 5
Fig. 6
Fig. 7
Fig. 8
Fig. 9
Fig. 10
Fig. 11
Fig. 12
Fig. 13
Fig. 14
Fig. 15
Fig. 16
Fig. 17
Fig. 18
Fig. 19
Fig. 20
Fig. 21
Fig. 22
Fig. 23
Fig. 24
Fig. 25
Fig. 26
Fig. 27
Fig. 28
Fig. 29

Notes

  1. https://github.com/MSharbaf/CMSysMap.

  2. http://ieeexplore.ieee.org.

  3. http://dl.acm.org.

  4. www.sciencedirect.com.

  5. https://onlinelibrary.wiley.com.

  6. https://link.springer.com.

  7. http://www.modelversioning.org/.

References

  1. Whitehead, J.: Collaboration in software engineering: a roadmap. In: Proceedings of the Future of Software Engineering (FOSE’07), pp. 214–225 (2007)

  2. Kolovos, D., Rose, L., Matragkas, N., Paige, R.F., Guerra, E., Cuadrado, J.S., De Lara, J., et al.: A research roadmap towards achieving scalability in model driven engineering. In: Proceedings of the Workshop on Scalability in Model Driven Engineering, pp. 1–10 (2013)

  3. Whitehead, J., Mistrík, I., Grundy, J., Hoek, A.V.D.: Collaborative software engineering: concepts and techniques. In: Collaborative Software Engineering, pp. 1–30 (2010)

  4. Mistrík, I., Grundy, J., Hoek, A.V.D., Whitehead, J.: Collaborative software engineering: challenges and prospects. In: Collaborative software engineering, pp. 389–403 (2010)

  5. Vredenburg, K., Mao, J.Y., Smith, P.W., Carey, T.: A survey of user-centered design practice. In: Proceedings of the SIGCHI Conference on Human Factors in Computing Systems, pp. 471–478 (2002)

  6. Franzago, M., Di Ruscio, D., Malavolta, I., Muccini, H.: Collaborative model-driven software engineering: a classification framework and a research map. IEEE Trans. Softw. Eng. 44(12), 1146–1175 (2017)

    Article  Google Scholar 

  7. Bézivin, J.: On the unification power of models. Softw. Syst. Model. 4(2), 171–188 (2005)

    Article  Google Scholar 

  8. Hutchinson, J., Rouncefield, M., Whittle, J.: Model-driven engineering practices in industry. In: Proceedings of the 33rd International Conference on Software Engineering, pp. 633–642 (2011)

  9. Brambilla, M., Cabot, J., Wimmer, M.: Model-Driven Software Engineering in Practice, 2nd edn. Morgan & Claypool Publishers, CA (2017)

    Book  Google Scholar 

  10. Altmanninger, K., Seidl, M., Wimmer, M.: A survey on model versioning approaches. Int. J. Web Inf. Syst. 5(3), 271–304 (2009)

    Article  Google Scholar 

  11. Mens, T.: A state-of-the-art survey on software merging. IEEE Trans. Softw. Eng. 28(5), 449–462 (2002)

    Article  Google Scholar 

  12. Westfechtel, B.: Merging of EMF models. Softw. Syst. Model. 13(2), 757–788 (2014)

    Article  Google Scholar 

  13. Masson, C., Corley, J., Syriani, E.: Feature model for collaborative modeling environments. In: Proceedings of the 2nd International Workshop on Collaborative Modelling in MDE at MODELS, pp. 164–173 (2017)

  14. Chechik, M., Nejati, S., Sabetzadeh, M.: A relationship-based approach to model integration. Innov. Syst. Softw. Eng. 8(1), 3–18 (2012)

    Article  Google Scholar 

  15. Koshima, A., Englebert, V.: Collaborative editing of EMF/Ecore meta-models and models: conflict detection, reconciliation, and merging in DiCoMEF. Sci. Comput. Program. 113, 3–28 (2015)

    Article  Google Scholar 

  16. Chong, H., Zhang, R., Qin, Z.: Composite-based conflict resolution in merging versions of UML models. In: Proceedings of the 17th IEEE/ACIS International Conference on Software Engineering, Artificial Intelligence, Networking and Parallel/Distributed Computing (SNPD), pp. 127–132 (2016)

  17. Koegel, M., Jonas, H., Stephan, S.: Operation-based conflict detection and resolution. In: Proceedings of the ICSE Workshop on Comparison and Versioning of Software Models, pp. 43–48 (2009)

  18. Sharbaf, M., Zamani, M., Sunyé, G.: A Formalism for Specifying Model Merging Conflicts. In: Proceedings of the 12th System Analysis and Modelling Conference, pp. 1–10 (2020)

  19. Goldberg, A.: Collaborative software engineering. J. Obj. Technol. 1(1), 1–19 (2002)

    Article  MathSciNet  Google Scholar 

  20. Zolkifli, N.N., Ngah, A., Deraman, A.: Version control system: a review. Procedia Comput. Sci. 135, 408–415 (2018)

    Article  Google Scholar 

  21. Barrett, S., Chalin, P., Butler, G.: Model merging falls short of software engineering needs. In: Proceedings of the 2nd Workshop on Model-Driven Software Evolution, pp. 13–18 (2008)

  22. Di Ruscio, D., Franzago, M., Malavolta, I., Muccini, H.: Envisioning the future of collaborative model-driven software engineering. In: Proceedings of the 39th International Conference on Software Engineering Companion (ICSE-C), pp. 219–221 (2017)

  23. Conradi, R., Westfechtel, B.: Version models for software configuration management. ACM Comput. Surv. 30(2), 232–282 (1998)

    Article  Google Scholar 

  24. Brosch, P., Kappel, P., Langer, P., Seidl, M., Wieland, K., Wimmer, M.: An introduction to model versioning. In: Proceedings of the International School on Formal Methods for the Design of Computer, Communication and Software Systems, pp. 336–398 (2012)

  25. Kanagasabai, N., Alam, O., Kienzle, J.: Towards online collaborative multi-view modelling. In: Proceedings of the 10th International Conference on System Analysis and Modeling, pp. 202–218 (2018)

  26. David, I., Aslam, K., Faridmoayer, S., Malavolta, I., Syriani, E., Lago, P.: Collaborative model-driven software engineering: a systematic update. In: Proceedings of the 24th International Conference on Model Driven Engineering Languages and Systems (MODELS), pp. 273–284 (2021)

  27. Steinberg, D., Budinsky, F., Merks, E., Paternostro, M.: EMF: Eclipse Modeling Framework, 2nd Revised Edition. Pearson Education (2008)

  28. Hojaji, F., Mayerhofer, T., Zamani, B., Hamou-Lhadj, A., Bousse, E.: Model execution tracing: a systematic mapping study. Softw. Syst. Model. 18(6), 3461–3485 (2019)

    Article  Google Scholar 

  29. Schwägerl, F., Uhrig, S., Westfechtel, B.: A graph-based algorithm for three-way merging of ordered collections in EMF models. Sci. Comput. Program. 113, 51–81 (2015)

    Article  Google Scholar 

  30. Altmanninger, K., Pierantonio, A.: A categorization for conflicts in model versioning. Elektrotechnik und Informationstechnik 128(11–12), 421–426 (2011)

    Article  Google Scholar 

  31. Petersen, K., Feldt, R., Mujtaba, S., Mattsson, M.: Systematic mapping studies in software engineering. In: Proceedings of the 12th International Conference on Evaluation and Assessment in Software Engineering, pp. 1–10 (2008)

  32. Brereton, P., Kitchenham, B.A., Budgen, D., Turner, M., Khalil, M.: Lessons from applying the systematic literature review process within the software engineering domain. J. Syst. Softw. 80(4), 571–583 (2007)

    Article  Google Scholar 

  33. Petersen, K., Vakkalanka, S., Kuzniarz, L.: Guidelines for conducting systematic mapping studies in software engineering: an update. Inf. Softw. Technol. 64, 1–18 (2015)

    Article  Google Scholar 

  34. Stephan, M., Cordy, J.R.: A survey of model comparison approaches and applications. In: Proceedings of the 1st International Conference on Model-Driven Engineering and Software Development (MODELSWARD), pp. 265–277 (2013)

  35. Gonçales, L., Farias, K., Scholl, M., Oliveira, T.C., Veronez, M.: Model Comparison: a systematic mapping study. In: Proceedings of the International Conference on Software Engineering and Knowledge Engineering, pp. 546–551 (2015)

  36. Addazi, L., Cicchetti, A.: Systematic evaluation of model comparison algorithms using model generation. J. Obj. Technol. 19(1), 1–22 (2020)

    Google Scholar 

  37. Bruneliere, H., Burger, E., Cabot, J., Wimmer, M.: A feature-based survey of model view approaches. Softw. Syst. Model. 18(3), 1931–1952 (2019)

    Article  Google Scholar 

  38. Basili, V.R., Caldiera, G., Rombach, H.D.: The goal question metric approach. In: Encyclopedia of Software Engineering, pp. 528–532 (1994)

  39. Wieringa, R., Maiden, N., Mead, N., Rolland, C.: Requirements engineering paper classification and evaluation criteria: a proposal and a discussion. Requir. Eng. 11(1), 102–107 (2006)

    Article  Google Scholar 

  40. Cuadros López, Á.J., Galindres, C., Ruiz, P.: Project maturity evaluation model for SMEs from the software development sub-sector. AD-Minister 29, 147–162 (2016)

    Article  Google Scholar 

  41. Chen, L., Babar, M.A., Zhang, H.: Towards an evidence-based understanding of electronic data sources. In: Proceedings of the 14th International Conference on Evaluation and Assessment in Software Engineering, pp. 1–4 (2010)

  42. Kitchenham, B., Charters, S.: Guidelines for Performing Systematic Literature Reviews in Software Engineering, Technical report, Ver. 2.3, School of Computer Science and Mathematics, Keele University (2007)

  43. Kuhrmann, M., Fernández, D.M., Daneva, M.: On the pragmatic design of literature studies in software engineering: an experience-based guideline. Empir. Softw. Eng. 22(6), 2852–2891 (2017)

    Article  Google Scholar 

  44. Wohlin, C.: Guidelines for snowballing in systematic literature studies and a replication in software engineering. In: Proceedings of the 18th International Conference on Evaluation and Assessment in Software Engineering, pp. 1–10 (2014)

  45. Kitchenham, B., Brereton, P.: A systematic review of systematic review process research in software engineering. Inf. Softw. Technol. 55(12), 2049–2075 (2013)

    Article  Google Scholar 

  46. Spencer, D.: Card Sorting: Designing Usable Categories. Rosenfeld Media, New York (2009)

  47. Cruzes, D.S., Dybå, T.: Research synthesis in software engineering: a tertiary study. Inf. Softw. Technol. 53(5), 440–455 (2011)

    Article  Google Scholar 

  48. Sharbaf, M., Zamani, B.: A UML profile for modeling the conflicts in model merging. In: Proceedings of the 4th IEEE International Conference on Knowledge-Based Engineering and Innovation, pp. 197–202 (2017)

  49. Cicchetti, A., Di Ruscio, D., Pierantonio, A.: Managing model conflicts in distributed development. In: Proceedings of the International Conference on Model Driven Engineering Languages and Systems, pp. 311–325 (2008)

  50. Zerrouk, M., Anwar, A., Benelallam, I.: Managing model conflicts in collaborative modeling using constraint programming. In: Proceedings of the 5th International Congress on Information Science and Technology (CiSt), pp. 117–123 (2018)

  51. Frühwirth, T., Herold, A., Küchenhoff, V., Provost, T.L., Lim, P., Monfroy, E., Wallace, M.: Constraint logic programming. In: Logic Programming Summer School, pp. 3–35 (1992)

  52. Zhu, H., Shan, L.: Well-formedness, consistency and completeness of graphic models. In: Proceedings of the 9th International Conference on Computer Modelling and Simulation, pp. 47–53 (2006)

  53. Brosch, P., Langer, P., Seidl, M., Wieland, K., Wimmer, M.: Colex: a web-based collaborative conflict lexicon. In: Proceedings of the 1st International Workshop on Model Comparison in Practice, pp. 42–49 (2010)

  54. Altmanninger, K., Bergmayr, A., Schwinger, W., Kotsis, G.: Semantically enhanced conflict detection between model versions in SMoVer by example. In: Proceedings of the International Workshop on Semantic-Based Software Development at OOPSLA (2007)

  55. Debreceni, C., Bergmann, G., Ráth, I., Dániel, V.: Property-based locking in collaborative modeling. In: Proceedings of the 20th International Conference on Model Driven Engineering Languages and Systems (MODELS), pp. 199–209 (2017)

  56. Shapiro, M., Preguiça, N., Baquero, C., Zawirski, M.: Conflict-free replicated data types. In: Symposium on Self-Stabilizing Systems, pp. 386–400 (2011)

  57. Kehrer, T., Kelter, U., Taentzer, G.: Consistency-preserving edit scripts in model versioning. In: Proceedings of the 28th IEEE/ACM International Conference on Automated Software Engineering (ASE), pp. 191–201 (2013)

  58. Zweihoff, P., Naujokat, S., Steffen, B.: Pyro: Generating domain-specific collaborative online modeling environments. In: Proceedings of the International Conference on Fundamental Approaches to Software Engineering, pp. 101–115 (2019)

  59. Sunyé, G.: Model consistency for distributed collaborative modeling. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 197–212 (2017)

  60. Brosch, P., Seidl, M., Kappel, G.: A recommender for conflict resolution support in optimistic model versioning. In: Proceedings of the ACM International Conference Companion on Object Oriented Programming Systems Languages and Applications, pp. 43–50 (2010)

  61. König, H., Diskin, Z.: Efficient consistency checking of interrelated models. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 161–178 (2017)

  62. Sharbaf, M., Zamani, F.: Configurable three-way model merging. Softw. Pract. Exp. 50(8), 1565–1599 (2020)

    Article  Google Scholar 

  63. Kolovos, D.S., Paige, R.F., Polack, F.A.: On the evolution of OCL for capturing structural constraints in modelling languages. In: Rigorous Methods for Software Construction and Analysis (2009), pp. 204–218

  64. Schaathun, H.G., Rutle, A.: Model-driven software engineering in the resource description framework: a way to version control. In: Norsk IKT-konferanse for forskning og utdanning, pp. 1–12 (2018)

  65. Fritsche, L., Kosiol, J., Möller, A., Schürr, A., Taentzer, G.: A precedence-driven approach for concurrent model synchronization scenarios using triple graph grammars. In: Proceedings of the 13th International Conference on Software Language Engineering, pp. 39–55 (2020)

  66. Bang, J.Y., Brun, Y., Medvidović, N.: Continuous analysis of collaborative design. In: Proceedings of the International Conference on Software Architecture (ICSA), pp. 97–106 (2017)

  67. Ehrig, H., Ermel, C., Taentzer, G.: A formal resolution strategy for operation-based conflicts in model versioning using graph modifications. In: Proceedings of the International Conference on Fundamental Approaches to Software Engineering, pp. 202–216 (2011)

  68. Demuth, A., Riedl-Ehrenleitner, M., Egyed, A.: Efficient detection of inconsistencies in a multi-developer engineering environment. In: Proceedings of the 31st IEEE/ACM International Conference on Automated Software Engineering (ASE), pp. 590–601 (2016)

  69. Mandel, L., Cengarle, M.V.: On the expressive power of OCL. In: International Symposium on Formal Methods, pp. 854–874 (1999)

  70. Gerth, C., Küster, J.M., Luckey, M., Engels, G.: Detection and resolution of conflicting change operations in version management of process models. Softw. Syst. Model. 12(3), 517–535 (2013)

    Article  Google Scholar 

  71. Kuiter, E., Krieter, S., Krüger, J., Leich, T., Saake, G.: Foundations of collaborative, real-time feature modeling. In: Proceedings of the 23rd International Systems and Software Product Line Conference-Volume A, pp. 257–264 (2019)

  72. Iswari, N.M.S., Azizah, F.N.: Improvement of Adaptable Model Versioning (AMOR) framework for software model versioning using critical pair analysis. In: Proceedings of the International Conference on Data and Software Engineering (ICODSE), pp. 1–5 (2014)

  73. Bartelt, C.: Conflict analysis at collaborative development of domain specific models using description logics. In: Proceedings of the 44th Hawaii International Conference on System Sciences, pp. 1–9 (2011)

  74. Mougenot, A., Blanc, X., Gervais, M.P.: D-praxis: a peer-to-peer collaborative model editing framework.’ In: Proceedings of the International Conference on Distributed Applications and Interoperable Systems, pp. 16–29 (2009)

  75. Easterbrook, S., Chechik, M.: A framework for multi-valued reasoning over inconsistent viewpoints. In: Proceedings of the 23rd International Conference on Software Engineering, pp. 411–420 (2001)

  76. Koshima, A., Englebert, V.: Collaborative editing of EMF/Ecore meta-models and models. In: Proceedings of the 2nd International Conferenceon Model-Driven Engineering and Software Development (MODELSWARD-2014), pp. 55–66 (2014)

  77. Debreceni, C., Ráth, I., Dániel, V., De Carlos, X., Mendialdua, X., Trujillo, S.: Automated model merge by design space exploration. In: Proceedings of the International Conference on Fundamental Approaches to Software Engineering, pp. 104–121 (2016)

  78. Kuiter, E., Krieter, S., Krüger, J., Saake, G., Leich, T.: variED: an editor for collaborative, real-time feature modeling. Empir. Softw. Eng. 26(2), 1–47 (2021)

    Article  Google Scholar 

  79. Nicolaescu, P., Rosenstengel, M., Derntl, M., Klamma, R., Jarke, M.: Near real-time collaborative modeling for view-based web information systems engineering. Inf. Syst. 74, 23–39 (2018)

    Article  Google Scholar 

  80. Rossini, A., Rutle, A., Lamo, A., Wolter, U.: Handling constraints in model versioning. In: Proceedings of the 3rd International Workshop on Collaborative Modelling in MDE at MODELS, pp. 1–9 (2018)

  81. Mafazi, S., Mayer, W., Stumptner, M.: Conflict resolution for on-the-fly change propagation in business processes. In: Proceedings of the 10th Asia-Pacific Conference on Conceptual Modelling, vol. 154, pp. 39–48 (2014)

  82. Phalp, K., Grimm, K., Xu, L.: Supporting collaborative work by preserving model meaning when merging graphical models. In: Proceedings of the Working Conference on Virtual Enterprises, pp. 262–269 (2012)

  83. Tröls, M.A., Mashkoor, M.A., Egyed, A.: Live and global consistency checking in a collaborative engineering environment. In: Proceedings of the 34th ACM/SIGAPP Symposium on Applied Computing, pp. 1776–1785 (2019)

  84. Erol, S., Neumann, G.: Handling concurrent changes in collaborative process model development: a change-pattern based approach. In: Proceedings of the 17th IEEE International Enterprise Distributed Object Computing Conference Workshops, pp. 250–257 (2013)

  85. Bartelt, C., Schindler, B.: Technology support for collaborative inconsistency management in model driven engineering. In: Proceedings of the 43rd Hawaii International Conference on System Sciences, pp. 1–7 (2010)

  86. Brosch, P., Seidl, M., Wimmer, M., Kappel, G.: Conflict visualization for evolving uml models. J. Obj. Technol. 11(3), 1–30 (2012)

    Google Scholar 

  87. Schwägerl, F., Uhrig, S., Westfechtel, B.: Model-based tool support for consistent three-way merging of EMF models. In: Proceedings of the Workshop on ACadeMics Tooling with Eclipse, pp. 1–10 (2013)

  88. Baqasah, A., Pardede, E., Rahayu, W.: A new approach for meaningful XML schema merging. In: Proceedings of the 16th International Conference on Information Integration and Web-based Applications & Services, pp. 430–439 (2014)

  89. Zhang, P., Neema, S., Bapty, T.: A study of collaborative efforts and proposed visualizations in domain-specific modeling environment. In: Proceedings of the International Conference on Cyber-Enabled Distributed Computing and Knowledge Discovery, pp. 146–152 (2016)

  90. Dam, H.K., Reder, A., Egyed, A.: Inconsistency resolution in merging versions of architectural models. In: Proceedings of the IEEE/IFIP Conference on Software Architecture, pp. 153–162 (2014)

  91. Gerth, C., Küster, J.M., Luckey, M., Engels, G.: Precise detection of conflicting change operations using process model terms. In: Proceedings of the International Conference on Model Driven Engineering Languages and Systems, pp. 93–107 (2010)

  92. Grossmann, G., Mafazi, S., Mayer, W., Schrefl, M., Stumptner, M.: Change propagation and conflict resolution for the co-evolution of business processes. Int. J. Cooper. Inf. Syst. 24(01), 1540002 (2015)

    Article  Google Scholar 

  93. Taentzer, G., Ermel, C., Langer, C., Wimmer, and : Conflict detection for model versioning based on graph modifications. In: Proceedings of the International Conference on Graph Transformation, pp. 171–186 (2010)

  94. Nejati, S.: Formal support for merging and negotiation. In: Proceedings of the 20th IEEE/ACM International Conference on Automated Software Engineering, pp. 456–460 (2005)

  95. Costa, V.O., Junior, J.M.B., Murta, L.G.P.: Semantic conflicts detection in model-driven engineering. In: Proceedings of the 25th International Conference on Software Engineering and Knowledge Engineering, pp. 656–661 (2013)

  96. Cataldo, M., Shelton, C., Choi, Y., Huang, Y.Y., Ramesh, V., Saini, D., Wang, L.Y.: Camel: a tool for collaborative distributed software design. In: Proceedings of the 4th International Conference on Global Software Engineering, pp. 83–92 (2009)

  97. Stünkel, P., König, H., Lamo, Y., Rutle, A.: Comprehensive systems: a formal foundation for multi-model consistency management. Form. Asp. Comput. 66, 1–48 (2021)

    MathSciNet  MATH  Google Scholar 

  98. Schröpfer, J., Schwägerl, F., Westfechtel, B.: Consistency control for model versions in evolving model-driven software product lines. In: Proceedings of the 22nd International Conference on Model Driven Engineering Languages and Systems Companion (MODELS-C), pp. 268–277 (2019)

  99. Tröls, M.A., Mashkoor, A., Egyed, A.: Multifaceted consistency checking of collaborative engineering artifacts. In: Proceedings of the 22nd International Conference on Model Driven Engineering Languages and Systems Companion (MODELS-C), pp. 278–287 (2019)

  100. Sabetzadeh, M., Nejati, S., Easterbrook, S., Chechik, M.: Global consistency checking of distributed models with TReMer+. In: Proceedings of the 30th International Conference on Software Engineering, pp. 815–818 (2008)

  101. Kessentini, M., Werda, W., Langer, P., Wimmer, M.: Search-based model merging. In: Proceedings of the 15th Annual Conference on Genetic and Evolutionary Computation, pp. 1453–1460 (2013)

  102. Altmanninger, K.: Models in conflict-towards a semantically enhanced version control system for models. In: Proceedings of the International Conference on Model Driven Engineering Languages and Systems, pp. 293–304 (2007)

  103. Bang, J.Y., Medvidović, N.: Proactive detection of higher-order software design conflicts. In: Proceedings of the 12th Working IEEE/IFIP Conference on Software Architecture, pp. 155–164 (2015)

  104. Farias, K., de Oliveira, T.C., Gonçales, L.J., Bischoff, V.: UML2Merge: a UML extension for model merging. IET Softw. 13(6), 575–586 (2019)

    Article  Google Scholar 

  105. Brosch, P., Egly, U., Gabmeyer, S., Kappel, G., Seidl, M., Tompits, H., Widl, H., Wimmer, M.: Towards semantics-aware merge support in optimistic model versioning. In: Proceedings of the International Conference on Model Driven Engineering Languages and Systems, pp. 246–256 (2011)

  106. Hachemi, A., Ahmed-Nacer, M.: Conflict resolution in process models merging. In: Proceedings of the Computational Methods in Systems and Software, pp. 336–345 (2020)

  107. Wieland, K., Langer, P., Seidl, M., Wimmer, M., Kappel, G.: Turning conflicts into collaboration. Comput. Supp. Cooper. Work 22(2–3), 181–240 (2013)

    Article  Google Scholar 

  108. Sharbaf, M., Zamani, B., Sunyé, G.: Automatic resolution of model merging conflict using quality-based reinforcement learning. J. Comput. Lang. 70, 101123 (2022)

    Article  Google Scholar 

  109. Altmanninger, K., Schwinger, W., Kotsis, G.: Semantics for accurate conflict detection in smover: specification, detection and presentation by example. Int. J. Enterp. Inf. Syst. 6(1), 68–84 (2010)

    Article  Google Scholar 

  110. Dam, H.K., Egyed, A., Winikoff, M., Reder, A., Lopez-Herrejon, R.E.: Consistent merging of model versions. J. Syst. Softw. 112, 137–155 (2016)

    Article  Google Scholar 

  111. Barrett, S.C., Chalin, P., Butler, G.: Table-driven detection and resolution of operation-based merge conflicts with mirador. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 329–344 (2011)

  112. Mens, T., Taentzer, G., Runge, O.: Detecting structural refactoring conflicts using critical pair analysis. Electron. Notes Theor. Comput. Sci. 127(3), 113–128 (2005)

    Article  Google Scholar 

  113. Rossini, A., Rutle, A., Lamo, Y., Wolter, U.: A formalisation of the copy-modify-merge approach to version control in MDE. J. Logic Algebr. Program. 79(7), 636–658 (2009)

    Article  MathSciNet  MATH  Google Scholar 

  114. Mansoor, U., Kessentini, M., Langer, P., Wimmer, M., Bechikh, S., Deb, K.: MOMM: multi-objective model merging. J. Syst. Softw. 103, 423–439 (2015)

    Article  Google Scholar 

  115. Sharbaf, M., Zamani, B., Sunyé, G.: Towards personalized change propagation for collaborative modeling. In: Proceedings of the 24th International Conference on Model Driven Engineering Languages and Systems Companion (MODELS-C), pp. 3–7 (2021)

  116. König, H., Diskin, Z.: Advanced local checking of global consistency in heterogeneous multimodeling. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 19–35 (2016)

  117. Pérez-Soler, S., Guerra, E., de Lara, J.: Collaborative modeling and group decision making using chatbots in social networks. IEEE Softw. 35(6), 48–54 (2018)

    Article  Google Scholar 

  118. Schobbens, P.Y., Heymans, P., Trigaux, J.C., Bontemps, Y.: Generic semantics of feature diagrams. Comput. Netw. 51(2), 456–479 (2007)

    Article  MATH  Google Scholar 

  119. Edded, S., Sassi, S.B., Mazo, R., Salinesi, C., Ghezala, H.B.: Collaborative configuration approaches in software product lines engineering: a systematic mapping study. J. Syst. Softw. 158, 110422 (2019)

    Article  Google Scholar 

  120. Koshima, A., Englebert, V., Thiran, P.: Distributed collaborative model editing framework for domain specific modeling tools. In: Proceedings of the 6th International Conference on Global Software Engineering, pp. 113–118 (2011)

  121. Koegel, M., Herrmannsdoerfer, M., Wesendonk, O., Helming, J.: Operation-based conflict detection. In: Proceedings of the 1st International Workshop on Model Comparison in Practice, pp. 21–30 (2010)

  122. Bang, J.Y., Brun, Y., Medvidović, N.: Collaborative-design conflicts: costs and solutions. IEEE Softw. 35(6), 25–31 (2018)

    Article  Google Scholar 

  123. Küster, J.M., Gerth, C., Engels, G.: Dependent and conflicting change operations of process models. In: Proceedings of the European Conference on Model Driven Architecture-Foundations and Applications, pp. 158–173 (2009)

  124. Sriplakich, P., Blanc, X., Gervais, M.P.: Supporting collaborative development in an open MDA environment. In: Proceedings of the 22nd IEEE International Conference on Software Maintenance, pp. 244–253 (2006)

  125. De Lucia, A., Fasano, F., Scanniello, G., Tortora, G.: Concurrent fine-grained versioning of UML models. In: Proceedings of the 13th European Conference on Software Maintenance and Reengineering, pp. 89–98 (2009)

  126. Brosch, P., Kargl, H., Langer, P., Seidl, P., Wieland, K., Wimmer, M., Kappel, G.: Conflicts as first-class entities: a UML profile for model versioning. In: Proceedings of Models in Software Engineering Workshop at MODELS, pp. 184–193 (2010)

  127. Taentzer, G., Ermel, C., Langer, P., Wimmer, M.: A fundamental approach to model versioning based on graph modifications: from theory to implementation. Softw. Syst. Model. 13(1), 239–272 (2014)

    Article  Google Scholar 

  128. Westfechtel, B.: A formal approach to three-way merging of EMF models. In: Proceedings of the 1st International Workshop on Model Comparison in Practice, pp. 31–41 (2010)

  129. Boronat, A., Artur, J.Á., Carsí, I.R., Letelier, P.: Formal model merging applied to class diagram integration. Electron. Notes Theor. Comput. Sci. 166, 5–26 (2007)

  130. Derntl, M., Nicolaescu, P., Erdtmann, P., Klamma, R., Jarke, and : Near real-time collaborative conceptual modeling on the web. In: Proceedings of the International Conference on Conceptual Modeling, pp. 344–357 (2015)

  131. Nicolaescu, P., Rosenstengel, M., Derntl, M., Klamma, R., Jarke, M.: View-based near real-time collaborative modeling for information systems engineering. In: Proceedings of the International Conference on Advanced Information Systems Engineering, pp. 3–17 (2016)

  132. Murta, L., Oliveira, H., Dantas, C., Lopes, L.G., Werner, C.: Odyssey-SCM: an integrated software configuration management infrastructure for UML models. Sci. Comput. Program. 65(3), 249–274 (2007)

    Article  MathSciNet  MATH  Google Scholar 

  133. Rajbhoj, A., Reddy, and : A graph-pattern based approach for meta-model specific conflict detection in a general-purpose model versioning system. In: Proceedings of the International Conference on Model Driven Engineering Languages and Systems, pp. 422–435 (2013)

  134. Rutle, A., Rossini, A., Lamo, Y., Wolter, U.: A category-theoretical approach to the formalisation of version control in MDE. In: Proceedings of the International Conference on Fundamental Approaches to Software Engineering, pp. 64–78 (2009)

  135. Cai, H.M., Ji, X.F., Bu, F.L.: Research of consistency maintenance mechanism in real-time collaborative multi-view business modeling. J. Shanghai Jiaotong Univ. Sci. 20(1), 86–92 (2015)

    Article  Google Scholar 

  136. Kelly, S.: Collaborative modelling with version control. In: Proceedings of the Federation of International Conferences on Software Technologies: Applications and Foundations, pp. 20–29 (2017)

  137. Zhang, Z., Zhang, R., Qin, Z.: Composite-level conflict detection in uml model versioning. Math. Probl. Eng. 2015, 1–9 (2015)

    Google Scholar 

  138. Jahed, K., Bagherzadeh, M., Dingel, J.: On the benefits of file-level modularity for EMF models. Softw. Syst. Model. 20(1), 267–286 (2021)

    Article  Google Scholar 

  139. Edded, S., Sassi, S., Mazo, R., Salinesi, C., Ghézala, H.: Preference-based conflict resolution for collaborative configuration of product lines. In: Proceedings of the International Conference on Evaluation of Novel Approaches to Software Engineering, pp. 1–8 (2020)

  140. Kallweit, B., Antonino, P.O., Jahic, J., Kuhn, T., Liggesmeyer, P.: Detection of conflicts and inconsistencies between architecture solutions. In: Proceedings of the 13th European Conference on Software Architecture, vol. 2, pp. 183–189 (2019)

  141. Foucault, M., Barbier, S., Lugato, D.: Enhancing version control with domain-specific semantics. In: Proceedings of the 5th International Workshop on Modeling in Software Engineering (MiSE), pp. 31–36 (2013)

  142. Tröls, M.A., Mashkoor, A., Egyed, A.: Collaboratively enhanced consistency checking in a cloud-based engineering environment. In: Proceedings of the ACM SIGCHI Symposium on Engineering Interactive Computing Systems, pp. 1–6 (2019)

  143. Tröls, M.A., Mashkoor, A., Egyed, A.: Timestamp-based consistency checking of collaboratively developed engineering artifacts. In: Proceedings of the International Conference on Software and System Processes, pp. 1–11 (2021)

  144. Tröls, M.A., Mashkoor, A., Egyed, A.: Hierarchical distribution of consistency-relevant changes in a collaborative engineering environment. In: Proceedings of the International Conference on Software and System Processes, pp. 1–11 (2021)

  145. Tröls, M.A., Mashkoor, A., Egyed, A.: Instant distribution of consistency-relevant change information in a hierarchical multi-developer engineering environment. In: Proceedings of the 36th Annual ACM Symposium on Applied Computing, pp. 1572–1575 (2021)

  146. Pottinger, R.A., Bernstein, P.A.: Merging models based on given correspondences. In: Proceedings of the 29th International Conference on Very Large Data Bases, pp. 862–873 (2003)

  147. Stünkel, P., König, H., Lamo, Y., Rutle, A.: Towards multiple model synchronization with comprehensive systems. In: Proceedings of the International Conference on Fundamental Approaches to Software Engineering, pp. 335–356 (2020)

  148. Assunçã, W., Vergilio, S.R., Lopez-Herrejon, R.E.: Discovering software architectures with search-based merge of UML model variants. In: Proceedings of the International Conference on Software Reuse, pp. 95–111 (2017)

  149. Perrouin, G., Brottier, E., Baudry, B., Le Traon, Y.: Composing models for detecting inconsistencies: a requirements engineering perspective. In: Proceedings of the International Working Conference on Requirements Engineering: Foundation for Software Quality, pp. 89–103 (2009)

  150. Dam, H.K., Ghose, A.: An agent-based framework for distributed collaborative model evolution. In: Proceedings of the 12th International Workshop on Principles of Software Evolution and the 7th annual ERCIM Workshop on Software Evolution, pp. 121–130 (2011)

  151. Sabetzadeh, M., Easterbrook, S.: An algebraic framework for merging incomplete and inconsistent views. In: Proceedings of the 13th IEEE International Conference on Requirements Engineering, pp. 306–315 (2005)

  152. Sabetzadeh, M., Easterbrook, S.: View merging in the presence of incompleteness and inconsistency. Requir. Eng. 11(3), 174–193 (2007)

    Article  Google Scholar 

  153. Jyani, J.P., Barwar, N.C.: A collaborative versioning framework for model-based version control systems. In: Proceedings of the International Conference on Communication and Computational Technologies, pp. 623–639 (2021)

  154. Sabetzadeh, M., Nejati, S., Liaskos, S., Easterbrook, S., Chechik, M.: Consistency checking of conceptual models via model merging. In: Proceedings of the International Requirements Engineering Conference, pp. 221–230 (2007)

  155. Sabetzadeh, M., Easterbrook, S.: Analysis of inconsistency in graph-based viewpoints: a category-theoretical approach. In: Proceedings of the International Conference on Automated Software Engineering, pp. 12–21 (2003)

  156. Sharbaf, M., Zamani, B., Ladani, B.T.: Towards automatic generation of formal specifications for UML consistency verification. In: Proceedings of the 2nd International Conference on Knowledge-Based Engineering and Innovation, pp. 860–865 (2015)

  157. Ram, S., Ramesh, V.: Collaborative conceptual schema design: a process model and prototype system. ACM Trans. Inf. Syst. 16(4), 347–371 (1998)

    Article  Google Scholar 

Download references

Author information

Authors and Affiliations

  1. MDSE Research Group, Department of Software Engineering, University of Isfahan, Isfahan, Iran

    Mohammadreza Sharbaf & Bahman Zamani

  2. LS2N, University of Nantes, Nantes, France

    Mohammadreza Sharbaf & Gerson Sunyé

Authors
  1. Mohammadreza Sharbaf
    View author publications

    You can also search for this author in PubMed Google Scholar

  2. Bahman Zamani
    View author publications

    You can also search for this author in PubMed Google Scholar

  3. Gerson Sunyé
    View author publications

    You can also search for this author in PubMed Google Scholar

Corresponding author

Correspondence to Bahman Zamani.

Additional information

Communicated by Ana Moreira.

Publisher's Note

Springer Nature remains neutral with regard to jurisdictional claims in published maps and institutional affiliations.

Appendix A: Classification results

Appendix A: Classification results

The classification results are presented in Table 4, 5, 6, 7, 8 to Table 9. While we use all features of the taxonomy for the classification, we omit some sub-features in the tables due to lack of space. All the extracted features for each

Table 4 Classification of model merging conflict management approaches (A01–A23)
Full size table
Table 5 Classification of model merging conflict management approaches (A24–A46)
Full size table
Table 6 Classification of model merging conflict management approaches (A47–A69)
Full size table
Table 7 Classification of model merging conflict management approaches (A01–A23)
Full size table
Table 8 Classification of model merging conflict management approaches (A24–A46)
Full size table
Table 9 Classification of model merging conflict management approaches (A47–A69)
Full size table

paper have been made publicly available within the replication package at https://github.com/MSharbaf/CMSysMap.

Rights and permissions

Springer Nature or its licensor holds exclusive rights to this article under a publishing agreement with the author(s) or other rightsholder(s); author self-archiving of the accepted manuscript version of this article is solely governed by the terms of such publishing agreement and applicable law.

Reprints and Permissions

About this article

Verify currency and authenticity via CrossMark

Cite this article

Sharbaf, M., Zamani, B. & Sunyé, G. Conflict management techniques for model merging: a systematic mapping review. Softw Syst Model (2022). https://doi.org/10.1007/s10270-022-01050-9

Download citation

  • Received:

  • Revised:

  • Accepted:

  • Published:

  • DOI: https://doi.org/10.1007/s10270-022-01050-9

Keywords

  • Conflict management
  • Model merging conflict
  • Collaborative modeling
  • Model driven engineering
  • Taxonomy
  • Systematic mapping