Skip to main content
Top
Published in: Software and Systems Modeling 3/2023

16-10-2022 | Regular Paper

Conflict management techniques for model merging: a systematic mapping review

Authors: Mohammadreza Sharbaf, Bahman Zamani, Gerson Sunyé

Published in: Software and Systems Modeling | Issue 3/2023

Log in

Activate our intelligent search to find suitable subject content or patents.

search-config
loading …

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.

Dont have a licence yet? Then find out more about our products and how to get one now:

Springer Professional "Wirtschaft+Technik"

Online-Abonnement

Mit Springer Professional "Wirtschaft+Technik" erhalten Sie Zugriff auf:

  • über 102.000 Bücher
  • über 537 Zeitschriften

aus folgenden Fachgebieten:

  • Automobil + Motoren
  • Bauwesen + Immobilien
  • Business IT + Informatik
  • Elektrotechnik + Elektronik
  • Energie + Nachhaltigkeit
  • Finance + Banking
  • Management + Führung
  • Marketing + Vertrieb
  • Maschinenbau + Werkstoffe
  • Versicherung + Risiko

Jetzt Wissensvorsprung sichern!

Springer Professional "Wirtschaft"

Online-Abonnement

Mit Springer Professional "Wirtschaft" erhalten Sie Zugriff auf:

  • über 67.000 Bücher
  • über 340 Zeitschriften

aus folgenden Fachgebieten:

  • Bauwesen + Immobilien
  • Business IT + Informatik
  • Finance + Banking
  • Management + Führung
  • Marketing + Vertrieb
  • Versicherung + Risiko




Jetzt Wissensvorsprung sichern!

Springer Professional "Technik"

Online-Abonnement

Mit Springer Professional "Technik" erhalten Sie Zugriff auf:

  • über 67.000 Bücher
  • über 390 Zeitschriften

aus folgenden Fachgebieten:

  • Automobil + Motoren
  • Bauwesen + Immobilien
  • Business IT + Informatik
  • Elektrotechnik + Elektronik
  • Energie + Nachhaltigkeit
  • Maschinenbau + Werkstoffe




 

Jetzt Wissensvorsprung sichern!

Appendix
Available only for authorised users
Literature
1.
go back to reference Whitehead, J.: Collaboration in software engineering: a roadmap. In: Proceedings of the Future of Software Engineering (FOSE’07), pp. 214–225 (2007) Whitehead, J.: Collaboration in software engineering: a roadmap. In: Proceedings of the Future of Software Engineering (FOSE’07), pp. 214–225 (2007)
2.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
7.
go back to reference Bézivin, J.: On the unification power of models. Softw. Syst. Model. 4(2), 171–188 (2005)CrossRef Bézivin, J.: On the unification power of models. Softw. Syst. Model. 4(2), 171–188 (2005)CrossRef
8.
go back to reference 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) 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.
go back to reference Brambilla, M., Cabot, J., Wimmer, M.: Model-Driven Software Engineering in Practice, 2nd edn. Morgan & Claypool Publishers, CA (2017)CrossRef Brambilla, M., Cabot, J., Wimmer, M.: Model-Driven Software Engineering in Practice, 2nd edn. Morgan & Claypool Publishers, CA (2017)CrossRef
10.
go back to reference Altmanninger, K., Seidl, M., Wimmer, M.: A survey on model versioning approaches. Int. J. Web Inf. Syst. 5(3), 271–304 (2009)CrossRef Altmanninger, K., Seidl, M., Wimmer, M.: A survey on model versioning approaches. Int. J. Web Inf. Syst. 5(3), 271–304 (2009)CrossRef
11.
go back to reference Mens, T.: A state-of-the-art survey on software merging. IEEE Trans. Softw. Eng. 28(5), 449–462 (2002)CrossRef Mens, T.: A state-of-the-art survey on software merging. IEEE Trans. Softw. Eng. 28(5), 449–462 (2002)CrossRef
12.
go back to reference Westfechtel, B.: Merging of EMF models. Softw. Syst. Model. 13(2), 757–788 (2014)CrossRef Westfechtel, B.: Merging of EMF models. Softw. Syst. Model. 13(2), 757–788 (2014)CrossRef
13.
go back to reference 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) 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.
go back to reference Chechik, M., Nejati, S., Sabetzadeh, M.: A relationship-based approach to model integration. Innov. Syst. Softw. Eng. 8(1), 3–18 (2012)CrossRef Chechik, M., Nejati, S., Sabetzadeh, M.: A relationship-based approach to model integration. Innov. Syst. Softw. Eng. 8(1), 3–18 (2012)CrossRef
15.
go back to reference 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)CrossRef 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)CrossRef
16.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Goldberg, A.: Collaborative software engineering. J. Obj. Technol. 1(1), 1–19 (2002)CrossRef Goldberg, A.: Collaborative software engineering. J. Obj. Technol. 1(1), 1–19 (2002)CrossRef
20.
go back to reference Zolkifli, N.N., Ngah, A., Deraman, A.: Version control system: a review. Procedia Comput. Sci. 135, 408–415 (2018)CrossRef Zolkifli, N.N., Ngah, A., Deraman, A.: Version control system: a review. Procedia Comput. Sci. 135, 408–415 (2018)CrossRef
21.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Conradi, R., Westfechtel, B.: Version models for software configuration management. ACM Comput. Surv. 30(2), 232–282 (1998)CrossRef Conradi, R., Westfechtel, B.: Version models for software configuration management. ACM Comput. Surv. 30(2), 232–282 (1998)CrossRef
24.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Steinberg, D., Budinsky, F., Merks, E., Paternostro, M.: EMF: Eclipse Modeling Framework, 2nd Revised Edition. Pearson Education (2008) Steinberg, D., Budinsky, F., Merks, E., Paternostro, M.: EMF: Eclipse Modeling Framework, 2nd Revised Edition. Pearson Education (2008)
28.
go back to reference 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)CrossRef 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)CrossRef
29.
go back to reference 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)CrossRef 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)CrossRef
30.
go back to reference Altmanninger, K., Pierantonio, A.: A categorization for conflicts in model versioning. Elektrotechnik und Informationstechnik 128(11–12), 421–426 (2011)CrossRef Altmanninger, K., Pierantonio, A.: A categorization for conflicts in model versioning. Elektrotechnik und Informationstechnik 128(11–12), 421–426 (2011)CrossRef
31.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
33.
go back to reference Petersen, K., Vakkalanka, S., Kuzniarz, L.: Guidelines for conducting systematic mapping studies in software engineering: an update. Inf. Softw. Technol. 64, 1–18 (2015)CrossRef Petersen, K., Vakkalanka, S., Kuzniarz, L.: Guidelines for conducting systematic mapping studies in software engineering: an update. Inf. Softw. Technol. 64, 1–18 (2015)CrossRef
34.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Addazi, L., Cicchetti, A.: Systematic evaluation of model comparison algorithms using model generation. J. Obj. Technol. 19(1), 1–22 (2020) Addazi, L., Cicchetti, A.: Systematic evaluation of model comparison algorithms using model generation. J. Obj. Technol. 19(1), 1–22 (2020)
37.
go back to reference Bruneliere, H., Burger, E., Cabot, J., Wimmer, M.: A feature-based survey of model view approaches. Softw. Syst. Model. 18(3), 1931–1952 (2019)CrossRef Bruneliere, H., Burger, E., Cabot, J., Wimmer, M.: A feature-based survey of model view approaches. Softw. Syst. Model. 18(3), 1931–1952 (2019)CrossRef
38.
go back to reference Basili, V.R., Caldiera, G., Rombach, H.D.: The goal question metric approach. In: Encyclopedia of Software Engineering, pp. 528–532 (1994) Basili, V.R., Caldiera, G., Rombach, H.D.: The goal question metric approach. In: Encyclopedia of Software Engineering, pp. 528–532 (1994)
39.
go back to reference 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)CrossRef 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)CrossRef
40.
go back to reference 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)CrossRef 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)CrossRef
41.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
44.
go back to reference 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) 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.
go back to reference Kitchenham, B., Brereton, P.: A systematic review of systematic review process research in software engineering. Inf. Softw. Technol. 55(12), 2049–2075 (2013)CrossRef Kitchenham, B., Brereton, P.: A systematic review of systematic review process research in software engineering. Inf. Softw. Technol. 55(12), 2049–2075 (2013)CrossRef
46.
go back to reference Spencer, D.: Card Sorting: Designing Usable Categories. Rosenfeld Media, New York (2009) Spencer, D.: Card Sorting: Designing Usable Categories. Rosenfeld Media, New York (2009)
47.
go back to reference Cruzes, D.S., Dybå, T.: Research synthesis in software engineering: a tertiary study. Inf. Softw. Technol. 53(5), 440–455 (2011)CrossRef Cruzes, D.S., Dybå, T.: Research synthesis in software engineering: a tertiary study. Inf. Softw. Technol. 53(5), 440–455 (2011)CrossRef
48.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Shapiro, M., Preguiça, N., Baquero, C., Zawirski, M.: Conflict-free replicated data types. In: Symposium on Self-Stabilizing Systems, pp. 386–400 (2011) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Sunyé, G.: Model consistency for distributed collaborative modeling. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 197–212 (2017) Sunyé, G.: Model consistency for distributed collaborative modeling. In: Proceedings of the European Conference on Modelling Foundations and Applications, pp. 197–212 (2017)
60.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Sharbaf, M., Zamani, F.: Configurable three-way model merging. Softw. Pract. Exp. 50(8), 1565–1599 (2020)CrossRef Sharbaf, M., Zamani, F.: Configurable three-way model merging. Softw. Pract. Exp. 50(8), 1565–1599 (2020)CrossRef
63.
go back to reference 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 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Mandel, L., Cengarle, M.V.: On the expressive power of OCL. In: International Symposium on Formal Methods, pp. 854–874 (1999) Mandel, L., Cengarle, M.V.: On the expressive power of OCL. In: International Symposium on Formal Methods, pp. 854–874 (1999)
70.
go back to reference 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)CrossRef 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)CrossRef
71.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
79.
go back to reference 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)CrossRef 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)CrossRef
80.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Brosch, P., Seidl, M., Wimmer, M., Kappel, G.: Conflict visualization for evolving uml models. J. Obj. Technol. 11(3), 1–30 (2012) Brosch, P., Seidl, M., Wimmer, M., Kappel, G.: Conflict visualization for evolving uml models. J. Obj. Technol. 11(3), 1–30 (2012)
87.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
93.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)MathSciNetMATH 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)MathSciNetMATH
98.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
105.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Wieland, K., Langer, P., Seidl, M., Wimmer, M., Kappel, G.: Turning conflicts into collaboration. Comput. Supp. Cooper. Work 22(2–3), 181–240 (2013)CrossRef Wieland, K., Langer, P., Seidl, M., Wimmer, M., Kappel, G.: Turning conflicts into collaboration. Comput. Supp. Cooper. Work 22(2–3), 181–240 (2013)CrossRef
108.
go back to reference Sharbaf, M., Zamani, B., Sunyé, G.: Automatic resolution of model merging conflict using quality-based reinforcement learning. J. Comput. Lang. 70, 101123 (2022)CrossRef Sharbaf, M., Zamani, B., Sunyé, G.: Automatic resolution of model merging conflict using quality-based reinforcement learning. J. Comput. Lang. 70, 101123 (2022)CrossRef
109.
go back to reference 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)CrossRef 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)CrossRef
110.
go back to reference 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)CrossRef 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)CrossRef
111.
go back to reference 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) 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.
go back to reference Mens, T., Taentzer, G., Runge, O.: Detecting structural refactoring conflicts using critical pair analysis. Electron. Notes Theor. Comput. Sci. 127(3), 113–128 (2005)CrossRef Mens, T., Taentzer, G., Runge, O.: Detecting structural refactoring conflicts using critical pair analysis. Electron. Notes Theor. Comput. Sci. 127(3), 113–128 (2005)CrossRef
113.
go back to reference 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)MathSciNetMATHCrossRef 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)MathSciNetMATHCrossRef
114.
go back to reference Mansoor, U., Kessentini, M., Langer, P., Wimmer, M., Bechikh, S., Deb, K.: MOMM: multi-objective model merging. J. Syst. Softw. 103, 423–439 (2015)CrossRef Mansoor, U., Kessentini, M., Langer, P., Wimmer, M., Bechikh, S., Deb, K.: MOMM: multi-objective model merging. J. Syst. Softw. 103, 423–439 (2015)CrossRef
115.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
118.
go back to reference Schobbens, P.Y., Heymans, P., Trigaux, J.C., Bontemps, Y.: Generic semantics of feature diagrams. Comput. Netw. 51(2), 456–479 (2007)MATHCrossRef Schobbens, P.Y., Heymans, P., Trigaux, J.C., Bontemps, Y.: Generic semantics of feature diagrams. Comput. Netw. 51(2), 456–479 (2007)MATHCrossRef
119.
go back to reference 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)CrossRef 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)CrossRef
120.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Bang, J.Y., Brun, Y., Medvidović, N.: Collaborative-design conflicts: costs and solutions. IEEE Softw. 35(6), 25–31 (2018)CrossRef Bang, J.Y., Brun, Y., Medvidović, N.: Collaborative-design conflicts: costs and solutions. IEEE Softw. 35(6), 25–31 (2018)CrossRef
123.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
128.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)MathSciNetMATHCrossRef 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)MathSciNetMATHCrossRef
133.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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)CrossRef 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)CrossRef
136.
go back to reference 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) 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.
go back to reference Zhang, Z., Zhang, R., Qin, Z.: Composite-level conflict detection in uml model versioning. Math. Probl. Eng. 2015, 1–9 (2015) Zhang, Z., Zhang, R., Qin, Z.: Composite-level conflict detection in uml model versioning. Math. Probl. Eng. 2015, 1–9 (2015)
138.
go back to reference Jahed, K., Bagherzadeh, M., Dingel, J.: On the benefits of file-level modularity for EMF models. Softw. Syst. Model. 20(1), 267–286 (2021)CrossRef Jahed, K., Bagherzadeh, M., Dingel, J.: On the benefits of file-level modularity for EMF models. Softw. Syst. Model. 20(1), 267–286 (2021)CrossRef
139.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Sabetzadeh, M., Easterbrook, S.: View merging in the presence of incompleteness and inconsistency. Requir. Eng. 11(3), 174–193 (2007)CrossRef Sabetzadeh, M., Easterbrook, S.: View merging in the presence of incompleteness and inconsistency. Requir. Eng. 11(3), 174–193 (2007)CrossRef
153.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference 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) 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.
go back to reference Ram, S., Ramesh, V.: Collaborative conceptual schema design: a process model and prototype system. ACM Trans. Inf. Syst. 16(4), 347–371 (1998)CrossRef Ram, S., Ramesh, V.: Collaborative conceptual schema design: a process model and prototype system. ACM Trans. Inf. Syst. 16(4), 347–371 (1998)CrossRef
Metadata
Title
Conflict management techniques for model merging: a systematic mapping review
Authors
Mohammadreza Sharbaf
Bahman Zamani
Gerson Sunyé
Publication date
16-10-2022
Publisher
Springer Berlin Heidelberg
Published in
Software and Systems Modeling / Issue 3/2023
Print ISSN: 1619-1366
Electronic ISSN: 1619-1374
DOI
https://doi.org/10.1007/s10270-022-01050-9

Other articles of this Issue 3/2023

Software and Systems Modeling 3/2023 Go to the issue

Premium Partner