{"status":"ok","message-type":"work","message-version":"1.0.0","message":{"indexed":{"date-parts":[[2025,12,6]],"date-time":"2025-12-06T09:19:15Z","timestamp":1765012755329,"version":"3.46.0"},"reference-count":56,"publisher":"Elsevier BV","license":[{"start":{"date-parts":[[2026,2,1]],"date-time":"2026-02-01T00:00:00Z","timestamp":1769904000000},"content-version":"tdm","delay-in-days":0,"URL":"https:\/\/www.elsevier.com\/tdm\/userlicense\/1.0\/"},{"start":{"date-parts":[[2026,2,1]],"date-time":"2026-02-01T00:00:00Z","timestamp":1769904000000},"content-version":"tdm","delay-in-days":0,"URL":"https:\/\/www.elsevier.com\/legal\/tdmrep-license"},{"start":{"date-parts":[[2025,11,4]],"date-time":"2025-11-04T00:00:00Z","timestamp":1762214400000},"content-version":"vor","delay-in-days":0,"URL":"http:\/\/creativecommons.org\/licenses\/by-nc-nd\/4.0\/"}],"funder":[{"DOI":"10.13039\/501100004489","name":"Mitacs Inc","doi-asserted-by":"publisher","id":[{"id":"10.13039\/501100004489","id-type":"DOI","asserted-by":"publisher"}]}],"content-domain":{"domain":["elsevier.com","sciencedirect.com"],"crossmark-restriction":true},"short-container-title":["Journal of Systems and Software"],"published-print":{"date-parts":[[2026,2]]},"DOI":"10.1016\/j.jss.2025.112694","type":"journal-article","created":{"date-parts":[[2025,11,5]],"date-time":"2025-11-05T00:27:32Z","timestamp":1762302452000},"page":"112694","update-policy":"https:\/\/doi.org\/10.1016\/elsevier_cm_policy","source":"Crossref","is-referenced-by-count":0,"special_numbering":"C","title":["Domain-specific conflict resolution and model merge"],"prefix":"10.1016","volume":"232","author":[{"ORCID":"https:\/\/orcid.org\/0000-0003-3052-553X","authenticated-orcid":false,"given":"Manouchehr","family":"Zadahmad Jafarlou","sequence":"first","affiliation":[],"role":[{"role":"author","vocabulary":"crossref"}]},{"ORCID":"https:\/\/orcid.org\/0000-0001-6527-1651","authenticated-orcid":false,"given":"Eugene","family":"Syriani","sequence":"additional","affiliation":[],"role":[{"role":"author","vocabulary":"crossref"}]}],"member":"78","reference":[{"key":"10.1016\/j.jss.2025.112694_bib0001","series-title":"Model Driven Engineering Languages and Systems","first-page":"293","article-title":"Models in conflict\u2013towards a semantically enhanced version control system for models","author":"Altmanninger","year":"2007"},{"issue":"1","key":"10.1016\/j.jss.2025.112694_bib0002","first-page":"68","article-title":"Semantics for accurate conflict detection in smover: specification, detection and presentation by example","volume":"6","author":"Altmanninger","year":"2010","journal-title":"Int. J. Enterp. Inf. Syst."},{"key":"10.1016\/j.jss.2025.112694_bib0003","series-title":"European Conference Modelling Foundations and Applications","first-page":"329","article-title":"Table-driven detection and resolution of operation-based merge conflicts with mirador","author":"Barrett","year":"2011"},{"key":"10.1016\/j.jss.2025.112694_bib0004","series-title":"Hawaii International Conference on System Sciences","first-page":"1","article-title":"Technology support for collaborative inconsistency management in model driven engineering","author":"Bartelt","year":"2010"},{"key":"10.1016\/j.jss.2025.112694_bib0005","unstructured":"[Bragagnolo et al., 2024] Bragagnolo, S., D\u2019Angelo, S., Gethers, M., Gall, H. C., 2024. Congra: A benchmark for automatic conflict resolution. arXiv preprint arXiv: 2409.14121https:\/\/arxiv.org\/html\/2409.14121v1."},{"key":"10.1016\/j.jss.2025.112694_bib0006","doi-asserted-by":"crossref","first-page":"562","DOI":"10.1007\/s10664-019-09735-4","article-title":"An empirical investigation into merge conflicts and their effect on software quality","volume":"25","author":"Brindescu","year":"2020","journal-title":"Empir. Softw. Eng."},{"key":"10.1016\/j.jss.2025.112694_bib0007","series-title":"Models in Software Engineering","first-page":"246","article-title":"Towards semantics-aware merge support in optimistic model versioning","author":"Brosch","year":"2012"},{"key":"10.1016\/j.jss.2025.112694_bib0008","series-title":"International School on Formal Methods for the Design of Computer, Communication and Software Systems","first-page":"336","article-title":"An introduction to model versioning","author":"Brosch","year":"2012"},{"issue":"3","key":"10.1016\/j.jss.2025.112694_bib0009","doi-asserted-by":"crossref","first-page":"2:1","DOI":"10.5381\/jot.2012.11.3.a2","article-title":"Conflict visualization for evolving UML models","volume":"11","author":"Brosch","year":"2012","journal-title":"J. Object Technol."},{"issue":"2","key":"10.1016\/j.jss.2025.112694_sbref0009","first-page":"29","article-title":"Model differences in the eclipse modeling framework","volume":"9","author":"Brun","year":"2008","journal-title":"UPGRADE Eur. J. Inf. Prof."},{"key":"10.1016\/j.jss.2025.112694_bib0011","series-title":"Foundations of Software Engineering","first-page":"168","article-title":"Proactive detection of collaboration conflicts","author":"Brun","year":"2011"},{"key":"10.1016\/j.jss.2025.112694_bib0012","series-title":"International Conference on Automated Software Engineering","first-page":"1002","article-title":"The impact of structure on software merging: semistructured versus structured merge","author":"Cavalcanti","year":"2019"},{"key":"10.1016\/j.jss.2025.112694_bib0013","unstructured":"[Chen et al., 2021] Chen, Y., Zhang, M., Liu, Q., Shang, W., Hassan, A. E., 2021. MergeBERT: predicting merge conflicts using transformer-based models. arXiv preprint arXiv: 2109.00084."},{"key":"10.1016\/j.jss.2025.112694_bib0014","series-title":"Software Engineering, Artificial Intelligence, Networking and Parallel\/Distributed Computing","first-page":"127","article-title":"Composite-based conflict resolution in merging versions of UML models","author":"Chong","year":"2016"},{"key":"10.1016\/j.jss.2025.112694_bib0015","article-title":"Detecting semantic conflicts with unit tests","volume":"205","author":"Da Silva","year":"2024","journal-title":"J. Syst. Softw."},{"key":"10.1016\/j.jss.2025.112694_bib0016","doi-asserted-by":"crossref","first-page":"137","DOI":"10.1016\/j.jss.2015.06.044","article-title":"Consistent merging of model versions","volume":"112","author":"Dam","year":"2016","journal-title":"J. Syst. Softw."},{"key":"10.1016\/j.jss.2025.112694_bib0017","series-title":"Model Driven Engineering Languages and Systems","first-page":"273","article-title":"Collaborative model-driven software engineering: a systematic update","author":"David","year":"2021"},{"key":"10.1016\/j.jss.2025.112694_bib0018","unstructured":"[DiffMerge, 2023] DiffMerge, E., 2023. https:\/\/wiki.eclipse.org\/EMF_DiffMerge. last accessed in March 2023."},{"key":"10.1016\/j.jss.2025.112694_bib0019","series-title":"Proceedings of the 39th IEEE\/ACM International Conference on Automated Software Engineering (ASE)","first-page":"141","article-title":"Revisiting the conflict-resolving problem from a semantic perspective","author":"Dong","year":"2024"},{"key":"10.1016\/j.jss.2025.112694_bib0020","unstructured":"[Eclipse CDO, 2024] Eclipse CDO, 2024. Eclipse CDO. https:\/\/eclipse.dev\/cdo\/. Accessed: 2024-11-13."},{"key":"10.1016\/j.jss.2025.112694_bib0021","unstructured":"[EGit, 2023] EGit, E., 2023. https:\/\/www.eclipse.org\/egit\/. (last accessed in March 2023)."},{"key":"10.1016\/j.jss.2025.112694_bib0022","series-title":"Model Driven Engineering Languages and Systems","first-page":"82","article-title":"Towards reinforcement learning for in-place model transformations","author":"Eisenberg","year":"2021"},{"issue":"4","key":"10.1016\/j.jss.2025.112694_bib0023","doi-asserted-by":"crossref","first-page":"2698","DOI":"10.1109\/TSE.2022.3228851","article-title":"Operation-based refactoring-aware merging: an empirical evaluation","volume":"49","author":"Ellis","year":"2023","journal-title":"Trans. Softw. Eng."},{"key":"10.1016\/j.jss.2025.112694_bib0024","unstructured":"[EMF Compare, 2021] EMF Compare, last accessed January 2021. https:\/\/www.eclipse.org\/emf\/compare\/."},{"issue":"4","key":"10.1016\/j.jss.2025.112694_bib0025","doi-asserted-by":"crossref","first-page":"383","DOI":"10.1145\/1101815.1101817","article-title":"Impact of software engineering research on the practice of software configuration management","volume":"14","author":"Estublier","year":"2005","journal-title":"Trans. Softw. Eng. Methodol."},{"issue":"12","key":"10.1016\/j.jss.2025.112694_bib0026","doi-asserted-by":"crossref","first-page":"1146","DOI":"10.1109\/TSE.2017.2755039","article-title":"Collaborative model-driven software engineering: a classification framework and a research map","volume":"44","author":"Franzago","year":"2018","journal-title":"IEEE Trans. Softw. Eng."},{"key":"10.1016\/j.jss.2025.112694_bib0027","series-title":"Proceedings of the 13th ACM SIGPLAN International Conference on Software Language Engineering","first-page":"39","article-title":"A precedence-driven approach for concurrent model synchronization scenarios using triple graph grammars","author":"Fritsche","year":"2020"},{"key":"10.1016\/j.jss.2025.112694_bib0028","series-title":"Software Langauge Engineering","first-page":"144","article-title":"Model transformation co-evolution: a semi-automatic approach","author":"Garc\u00eda","year":"2013"},{"key":"10.1016\/j.jss.2025.112694_bib0029","series-title":"Software Engineering Perspectives in Intelligent Systems: Proceedings of 4th Computational Methods in Systems and Software 2020, Vol. 1 4","first-page":"336","article-title":"Conflict resolution in process models merging","author":"Hachemi","year":"2020"},{"key":"10.1016\/j.jss.2025.112694_bib0030","series-title":"International Conference on Software Engineering: New Ideas and Emerging Results","first-page":"77","article-title":"\u201dDon\u2019t touch my model!\u201d towards managing model history and versions during metamodel evolution","author":"Homolka","year":"2024"},{"issue":"4","key":"10.1016\/j.jss.2025.112694_bib0031","doi-asserted-by":"crossref","first-page":"349","DOI":"10.1057\/palgrave.ejis.3000685","article-title":"DSMDiff: a differentiation tool for domain-specific models","volume":"16","author":"Lin","year":"2007","journal-title":"Eur. J. Inf. Syst."},{"key":"10.1016\/j.jss.2025.112694_bib0032","series-title":"2019 IEEE 26th International Conference on Software Analysis, Evolution and Reengineering (SANER)","first-page":"151","article-title":"Are refactorings to blame? an empirical study of refactorings in merge conflicts","author":"Mahmoudi","year":"2019"},{"key":"10.1016\/j.jss.2025.112694_bib0033","doi-asserted-by":"crossref","first-page":"423","DOI":"10.1016\/j.jss.2014.11.043","article-title":"MOMM: multi-objective model merging","volume":"103","author":"Mansoor","year":"2015","journal-title":"J. Syst. Softw."},{"issue":"5","key":"10.1016\/j.jss.2025.112694_bib0034","doi-asserted-by":"crossref","first-page":"449","DOI":"10.1109\/TSE.2002.1000449","article-title":"A state-of-the-art survey on software merging","volume":"28","author":"Mens","year":"2002","journal-title":"Trans. Softw. Eng."},{"issue":"3","key":"10.1016\/j.jss.2025.112694_bib0035","doi-asserted-by":"crossref","first-page":"113","DOI":"10.1016\/j.entcs.2004.08.038","article-title":"Detecting structural refactoring conflicts using critical pair analysis","volume":"127","author":"Mens","year":"2005","journal-title":"Electron. Notes Theor. Comput. Sci."},{"issue":"8","key":"10.1016\/j.jss.2025.112694_bib0036","doi-asserted-by":"crossref","first-page":"1565","DOI":"10.1002\/spe.2835","article-title":"Configurable three-way model merging","volume":"50","author":"Sharbaf","year":"2020","journal-title":"Softw. Pract. Exper."},{"key":"10.1016\/j.jss.2025.112694_bib0037","series-title":"Knowledge-Based Engineering and Innovation","first-page":"860","article-title":"Towards automatic generation of formal specifications for UML consistency verification","author":"Sharbaf","year":"2015"},{"key":"10.1016\/j.jss.2025.112694_bib0038","series-title":"System Analysis and Modelling","first-page":"1","article-title":"A formalism for specifying model merging conflicts","author":"Sharbaf","year":"2020"},{"key":"10.1016\/j.jss.2025.112694_bib0039","article-title":"Automatic resolution of model merging conflicts using quality-based reinforcement learning","volume":"71","author":"Sharbaf","year":"2022","journal-title":"J. Comput. Lang."},{"issue":"3","key":"10.1016\/j.jss.2025.112694_bib0040","doi-asserted-by":"crossref","first-page":"1031","DOI":"10.1007\/s10270-022-01050-9","article-title":"Conflict management techniques for model merging: a systematic mapping review","volume":"22","author":"Sharbaf","year":"2022","journal-title":"Softw. Syst. Model."},{"key":"10.1016\/j.jss.2025.112694_bib0041","doi-asserted-by":"crossref","DOI":"10.1016\/j.jss.2024.112227","article-title":"CoMPers: a configurable conflict management framework for personalized collaborative modeling","volume":"219","author":"Sharbaf","year":"2025","journal-title":"J. Syst. Softw."},{"key":"10.1016\/j.jss.2025.112694_bib0042","series-title":"Automated Software Engineering","first-page":"1291","article-title":"Somanyconflicts: resolve many merge conflicts interactively and systematically","author":"Shen","year":"2021"},{"key":"10.1016\/j.jss.2025.112694_bib0043","first-page":"1","article-title":"Intellimerge: a refactoring-aware software merging technique","volume":"3","author":"Shen","year":"2019","journal-title":"Program. Lang."},{"key":"10.1016\/j.jss.2025.112694_bib0044","series-title":"International Conference on Software Maintenance and Evolution","first-page":"174","article-title":"Detecting semantic conflicts via automated behavior change detection","author":"Silva","year":"2020"},{"key":"10.1016\/j.jss.2025.112694_bib0045","series-title":"International Conference on Graph Transformation","first-page":"196","article-title":"Henshin: a usability-focused framework for EMF model transformation development","author":"Str\u00fcber","year":"2017"},{"key":"10.1016\/j.jss.2025.112694_bib0046","series-title":"Symposium on Applied Computing","first-page":"1776","article-title":"Live and global consistency checking in a collaborative engineering environment","author":"Tr\u00f6ls","year":"2019"},{"issue":"3","key":"10.1016\/j.jss.2025.112694_bib0047","doi-asserted-by":"crossref","first-page":"930","DOI":"10.1109\/TSE.2020.3007722","article-title":"Refactoringminer 2.0","volume":"48","author":"Tsantalis","year":"2020","journal-title":"Transactions on Software Engineering"},{"issue":"6","key":"10.1016\/j.jss.2025.112694_bib0048","doi-asserted-by":"crossref","first-page":"2461","DOI":"10.1007\/s10270-022-00976-4","article-title":"An efficient line-based approach for resolving merge conflicts in XMI-based models","volume":"21","author":"de la Vega","year":"2022","journal-title":"Softw. Syst. Model."},{"key":"10.1016\/j.jss.2025.112694_bib0049","series-title":"Software Langauge Engineering","first-page":"201","article-title":"Reconstructing complex metamodel evolution","author":"Vermolen","year":"2012"},{"key":"10.1016\/j.jss.2025.112694_bib0050","series-title":"Intelligent Engineering Systems","first-page":"233","article-title":"Sirius: a rapid development of DSM graphical editor","author":"Viyovi\u0107","year":"2014"},{"key":"10.1016\/j.jss.2025.112694_bib0051","doi-asserted-by":"crossref","first-page":"757","DOI":"10.1007\/s10270-012-0279-3","article-title":"Merging of EMF models: formal foundations","volume":"13","author":"Westfechtel","year":"2014","journal-title":"Softw. Syst. Model."},{"key":"10.1016\/j.jss.2025.112694_bib0052","series-title":"Computer Supported Cooperative Work (CSCW)","first-page":"181","article-title":"Turning conflicts into collaboration","volume":"22","author":"Wieland","year":"2013"},{"key":"10.1016\/j.jss.2025.112694_bib0053","series-title":"Software Language Engineering","first-page":"100","article-title":"Domain-specific model differencing in visual concrete syntax","author":"Zadahmad","year":"2019"},{"key":"10.1016\/j.jss.2025.112694_bib0054","doi-asserted-by":"crossref","first-page":"2067","DOI":"10.1007\/s10270-021-00971-1","article-title":"Dsmcompare: domain-specific model differencing for graphical domain-specific languages","volume":"21","author":"Zadahmad","year":"2022","journal-title":"Softw. Syst. Model."},{"issue":"1","key":"10.1016\/j.jss.2025.112694_bib0055","doi-asserted-by":"crossref","first-page":"1:1","DOI":"10.5381\/jot.2023.22.1.a5","article-title":"From two-way to three-way: domain-specific model differencing and conflict detection","volume":"22","author":"Zadahmad Jafarlou","year":"2023","journal-title":"J. Object Technol."},{"key":"10.1016\/j.jss.2025.112694_bib0056","series-title":"International Symposium on Software Testing and Analysis","first-page":"77","article-title":"Using pre-trained language models to resolve textual and semantic merge conflicts (experience paper)","author":"Zhang","year":"2022"}],"container-title":["Journal of Systems and Software"],"original-title":[],"language":"en","link":[{"URL":"https:\/\/api.elsevier.com\/content\/article\/PII:S0164121225003632?httpAccept=text\/xml","content-type":"text\/xml","content-version":"vor","intended-application":"text-mining"},{"URL":"https:\/\/api.elsevier.com\/content\/article\/PII:S0164121225003632?httpAccept=text\/plain","content-type":"text\/plain","content-version":"vor","intended-application":"text-mining"}],"deposited":{"date-parts":[[2025,12,6]],"date-time":"2025-12-06T09:17:26Z","timestamp":1765012646000},"score":1,"resource":{"primary":{"URL":"https:\/\/linkinghub.elsevier.com\/retrieve\/pii\/S0164121225003632"}},"subtitle":[],"short-title":[],"issued":{"date-parts":[[2026,2]]},"references-count":56,"alternative-id":["S0164121225003632"],"URL":"https:\/\/doi.org\/10.1016\/j.jss.2025.112694","relation":{},"ISSN":["0164-1212"],"issn-type":[{"type":"print","value":"0164-1212"}],"subject":[],"published":{"date-parts":[[2026,2]]},"assertion":[{"value":"Elsevier","name":"publisher","label":"This article is maintained by"},{"value":"Domain-specific conflict resolution and model merge","name":"articletitle","label":"Article Title"},{"value":"Journal of Systems and Software","name":"journaltitle","label":"Journal Title"},{"value":"https:\/\/doi.org\/10.1016\/j.jss.2025.112694","name":"articlelink","label":"CrossRef DOI link to publisher maintained version"},{"value":"article","name":"content_type","label":"Content Type"},{"value":"\u00a9 2025 The Author(s). Published by Elsevier Inc.","name":"copyright","label":"Copyright"}],"article-number":"112694"}}