{"status":"ok","message-type":"work","message-version":"1.0.0","message":{"indexed":{"date-parts":[[2026,7,8]],"date-time":"2026-07-08T12:22:06Z","timestamp":1783513326720,"version":"3.55.0"},"publisher-location":"New York, NY, USA","reference-count":50,"publisher":"ACM","license":[{"start":{"date-parts":[[2026,4,12]],"date-time":"2026-04-12T00:00:00Z","timestamp":1775952000000},"content-version":"vor","delay-in-days":0,"URL":"https:\/\/creativecommons.org\/licenses\/by\/4.0\/legalcode"}],"funder":[{"name":"Swiss National Science Foundation (SNSF)","award":["219719"],"award-info":[{"award-number":["219719"]}]}],"content-domain":{"domain":["dl.acm.org"],"crossmark-restriction":true},"short-container-title":[],"published-print":{"date-parts":[[2026,4,12]]},"DOI":"10.1145\/3786582.3786840","type":"proceedings-article","created":{"date-parts":[[2026,7,8]],"date-time":"2026-07-08T11:52:47Z","timestamp":1783511567000},"page":"206-210","update-policy":"https:\/\/doi.org\/10.1145\/crossmark-policy","source":"Crossref","is-referenced-by-count":0,"title":["Turning Merge Conflicts Into Conflict-Induced Variability"],"prefix":"10.1145","author":[{"ORCID":"https:\/\/orcid.org\/0009-0002-2135-1136","authenticated-orcid":false,"given":"Manuel","family":"Ohrndorf","sequence":"first","affiliation":[{"name":"University of Bern, Bern, Switzerland"}],"role":[{"vocabulary":"crossref","role":"author"}]},{"ORCID":"https:\/\/orcid.org\/0000-0002-9881-9748","authenticated-orcid":false,"given":"Alexander","family":"Boll","sequence":"additional","affiliation":[{"name":"University of Bern, Bern, Switzerland"}],"role":[{"vocabulary":"crossref","role":"author"}]},{"ORCID":"https:\/\/orcid.org\/0009-0004-8745-7800","authenticated-orcid":false,"given":"Roman","family":"B\u00f6gli","sequence":"additional","affiliation":[{"name":"University of Bern, Bern, Switzerland"}],"role":[{"vocabulary":"crossref","role":"author"}]},{"ORCID":"https:\/\/orcid.org\/0000-0002-2582-5557","authenticated-orcid":false,"given":"Timo","family":"Kehrer","sequence":"additional","affiliation":[{"name":"University of Bern, Bern, Switzerland"}],"role":[{"vocabulary":"crossref","role":"author"}]}],"member":"320","published-online":{"date-parts":[[2026,7,8]]},"reference":[{"key":"e_1_3_3_1_2_2","doi-asserted-by":"crossref","unstructured":"W. Aldndni N. Meng and F. Servant. 2023. Automatic prediction of developers\u2019 resolutions for software merge conflicts. Journal of Systems and Software 206 (2023).","DOI":"10.1016\/j.jss.2023.111836"},{"key":"e_1_3_3_1_3_2","doi-asserted-by":"publisher","DOI":"10.1007\/978-3-642-37521-7"},{"key":"e_1_3_3_1_4_2","first-page":"120","volume-title":"Proc. Int\u2019l Conf. on Automated Software Engineering","author":"Apel Sven","year":"2012","unstructured":"Sven Apel, Olaf Le\u00dfenich, and Christian Lengauer. 2012. Structured merge with auto-tuning: balancing precision and performance. In Proc. Int\u2019l Conf. on Automated Software Engineering. 120\u2013129."},{"key":"e_1_3_3_1_5_2","first-page":"158","volume-title":"Proc. Int\u2019l Conf. on Software Engineering","author":"Balzer Robert","year":"1991","unstructured":"Robert Balzer. 1991. Tolerating inconsistency (software development). In Proc. Int\u2019l Conf. on Software Engineering. 158\u2013159."},{"key":"e_1_3_3_1_6_2","first-page":"356","volume-title":"Proc. Int\u2019l Working Conf. on Mining Software Repositories","author":"Beller Moritz","year":"2017","unstructured":"Moritz Beller, Georgios Gousios, and Andy Zaidman. 2017. Oops, my tests broke the build: An explorative analysis of travis ci with github. In Proc. Int\u2019l Working Conf. on Mining Software Repositories. IEEE, 356\u2013367."},{"key":"e_1_3_3_1_7_2","unstructured":"Thorsten Berger Marsha Chechik Timo Kehrer and Manuel Wimmer. 2019. Software evolution in time and space: Unifying version and variability management (Dagstuhl Seminar 19191). Dagstuhl Reports 9 5 (2019) 1\u201330."},{"key":"e_1_3_3_1_8_2","first-page":"571","volume-title":"Proc. Int\u2019l Conf. on the Foundations of Software Engineering: Ideas, Visions and Reflections","author":"B\u00f6gli Roman","year":"2025","unstructured":"Roman B\u00f6gli, Alexander Boll, Alexander Schulthei\u00df, and Timo Kehrer. 2025. Beyond Software Families: Community-Driven Variability. In Proc. Int\u2019l Conf. on the Foundations of Software Engineering: Ideas, Visions and Reflections. 571\u2013575."},{"key":"e_1_3_3_1_9_2","first-page":"282","volume-title":"Proc. Int\u2019l Conf. on Evaluation and Assessment in Software Engineering","author":"Boll Alexander","year":"2024","unstructured":"Alexander Boll, Yael Van\u00a0Dok, Manuel Ohrndorf, Alexander Schulthei\u00df, and Timo Kehrer. 2024. Towards Semi-Automated Merge Conflict Resolution: Is It Easier Than We Expected?. In Proc. Int\u2019l Conf. on Evaluation and Assessment in Software Engineering. 282\u2013292."},{"key":"e_1_3_3_1_10_2","doi-asserted-by":"crossref","unstructured":"Yuriy Brun Reid Holmes Michael\u00a0D Ernst and David Notkin. 2013. Early detection of collaboration conflicts and risks. IEEE Trans. on Software Engineering 39 10 (2013) 1358\u20131375.","DOI":"10.1109\/TSE.2013.28"},{"key":"e_1_3_3_1_11_2","first-page":"1002","volume-title":"Proc. Int\u2019l Conf. on Automated Software Engineering","author":"Cavalcanti Guilherme","year":"2019","unstructured":"Guilherme Cavalcanti, Paulo Borba, Georg Seibt, and Sven Apel. 2019. The impact of structure on software merging: semistructured versus structured merge. In Proc. Int\u2019l Conf. on Automated Software Engineering. 1002\u20131013."},{"key":"e_1_3_3_1_12_2","doi-asserted-by":"crossref","unstructured":"Reidar Conradi and Bernhard Westfechtel. 1998. Version Models for Software Configuration Management. Comput. Surveys 30 2 (1998) 232\u2013282.","DOI":"10.1145\/280277.280280"},{"key":"e_1_3_3_1_13_2","doi-asserted-by":"crossref","unstructured":"Elizabeth Dinella Todd Mytkowicz Alexey Svyatkovskiy Christian Bird Mayur Naik and Shuvendu Lahiri. 2023. DeepMerge: Learning to Merge Programs. IEEE Trans. on Software Engineering 49 4 (April 2023) 1599\u20131614.","DOI":"10.1109\/TSE.2022.3183955"},{"key":"e_1_3_3_1_14_2","first-page":"1652","volume-title":"Proc. Int\u2019l Conf. on Automated Software Engineering","author":"Dong Jinhao","year":"2023","unstructured":"Jinhao Dong, Qihao Zhu, Zeyu Sun, Yiling Lou, and Dan Hao. 2023. Merge Conflict Resolution: Classification or Generation?. In Proc. Int\u2019l Conf. on Automated Software Engineering. 1652\u20131663."},{"key":"e_1_3_3_1_15_2","doi-asserted-by":"crossref","unstructured":"Paulo Elias Heleno De\u00a0S. Campos Eduardo Ogasawara and Leonardo Gresta\u00a0Paulino Murta. 2023. Towards accurate recommendations of merge conflicts resolution strategies. Information and Software Technology 164 (2023) 107332.","DOI":"10.1016\/j.infsof.2023.107332"},{"key":"e_1_3_3_1_16_2","doi-asserted-by":"crossref","unstructured":"Max Ellis Sarah Nadi and Danny Dig. 2022. Operation-based refactoring-aware merging: An empirical evaluation. IEEE Trans. on Software Engineering 49 4 (2022) 2698\u20132721.","DOI":"10.1109\/TSE.2022.3228851"},{"key":"e_1_3_3_1_17_2","doi-asserted-by":"crossref","unstructured":"Emelie Engstr\u00f6m Margaret-Anne Storey Per Runeson Martin H\u00f6st and Maria\u00a0Teresa Baldassarre. 2020. How software engineering research aligns with design science: a review. Empirical Software Engineering 25 (2020) 2630\u20132660.","DOI":"10.1007\/s10664-020-09818-7"},{"key":"e_1_3_3_1_18_2","first-page":"26","volume-title":"Proc. Int\u2019l Conf. on Global Software Engineering","author":"Estler H\u00a0Christian","year":"2014","unstructured":"H\u00a0Christian Estler, Martin Nordio, Carlo\u00a0A Furia, and Bertrand Meyer. 2014. Awareness and merge conflicts in distributed software development. In Proc. Int\u2019l Conf. on Global Software Engineering. 26\u201335."},{"key":"e_1_3_3_1_19_2","doi-asserted-by":"crossref","unstructured":"Jacky Estublier David Leblang Andr\u00e9 van\u00a0der Hoek Reidar Conradi Geoffrey Clemm Walter Tichy and Darcy Wiborg-Weber. 2005. Impact of Software Engineering Research on the Practice of Software Configuration Management. ACM Trans. on Software Engineering and Methodology 14 4 (2005) 383\u2013430.","DOI":"10.1145\/1101815.1101817"},{"key":"e_1_3_3_1_20_2","doi-asserted-by":"crossref","unstructured":"Anthony\u00a0CW Finkelstein Dov Gabbay Anthony Hunter Jeff Kramer and Bashar Nuseibeh. 1994. Inconsistency handling in multiperspective specifications. IEEE Trans. on Software Engineering 20 8 (1994) 569\u2013578.","DOI":"10.1109\/32.310667"},{"key":"e_1_3_3_1_21_2","first-page":"665","volume-title":"Proc. Int\u2019l Conf. on Software Engineering (ICSE)","author":"Fischer Stefan","year":"2015","unstructured":"Stefan Fischer, Lukas Linsbauer, Roberto\u00a0E. Lopez-Herrejon, and Alexander Egyed. 2015. The ECCO Tool: Extraction and Composition for Clone-and-Own. In Proc. Int\u2019l Conf. on Software Engineering (ICSE). IEEE, 665\u2013668."},{"key":"e_1_3_3_1_22_2","doi-asserted-by":"crossref","unstructured":"Gleiph Ghiotto Leonardo Murta M\u00e1rcio Barros and Andr\u00e9 van\u00a0der Hoek. 2020. On the Nature of Merge Conflicts: A Study of 2 731 Open Source Java Projects Hosted by GitHub. IEEE Trans. on Software Engineering 46 8 (2020) 892\u2013915.","DOI":"10.1109\/TSE.2018.2871083"},{"key":"e_1_3_3_1_23_2","doi-asserted-by":"crossref","unstructured":"Heleno de S.\u00a0Campos Junior Gleiph Ghiotto L.\u00a0de Menezes M\u00e1rcio de\u00a0Oliveira Barros Andr\u00e9 van\u00a0der Hoek and Leonardo Gresta\u00a0Paulino Murta. 2024. How code composition strategies affect merge conflict resolution? Journal of Software Engineering Research and Development 12 1 (2024).","DOI":"10.5753\/jserd.2024.3638"},{"key":"e_1_3_3_1_24_2","doi-asserted-by":"crossref","unstructured":"Christian K\u00e4stner Sven Apel Thomas Th\u00fcm and Gunter Saake. 2012. Type Checking Annotation-Based Product Lines. ACM Trans. on Software Engineering and Methodology 21 3 (2012) 14:1\u201314:39.","DOI":"10.1145\/2211616.2211617"},{"key":"e_1_3_3_1_25_2","doi-asserted-by":"publisher","DOI":"10.1145\/2377816.2377817"},{"key":"e_1_3_3_1_26_2","unstructured":"Timo Kehrer. 2015. Calculation and propagation of model changes based on user-level edit operations: a foundation for version and variant management in model-driven engineering. Ph.\u00a0D. Dissertation. University of Siegen."},{"key":"e_1_3_3_1_27_2","doi-asserted-by":"crossref","first-page":"92","DOI":"10.1007\/978-3-319-61473-1_7","volume-title":"Proc. Int\u2019l Conf. on Theory and Practice of Model Transformations","author":"Kehrer Timo","year":"2017","unstructured":"Timo Kehrer, Abdullah Alshanqiti, and Reiko Heckel. 2017. Automatic inference of rule-based specifications of complex in-place model transformations. In Proc. Int\u2019l Conf. on Theory and Practice of Model Transformations. 92\u2013107."},{"key":"e_1_3_3_1_28_2","first-page":"21","volume-title":"Proc. Int\u2019l Conf. on Software Engineering: New Ideas and Emerging Results","author":"Kehrer Timo","year":"2021","unstructured":"Timo Kehrer, Thomas Th\u00fcm, Alexander Schulthei\u00df, and Paul\u00a0Maximilian Bittner. 2021. Bridging the gap between clone-and-own and software product lines. In Proc. Int\u2019l Conf. on Software Engineering: New Ideas and Emerging Results. 21\u201325."},{"key":"e_1_3_3_1_29_2","doi-asserted-by":"crossref","unstructured":"Olaf Le\u00dfenich Sven Apel and Christian Lengauer. 2015. Balancing precision and performance in structured merge. Proc. Int\u2019l Conf. on Automated Software Engineering 22 3 (2015) 367\u2013397.","DOI":"10.1007\/s10515-014-0151-5"},{"key":"e_1_3_3_1_30_2","volume-title":"Version Control with Git: Powerful tools and techniques for collaborative software development","author":"Loeliger Jon","year":"2012","unstructured":"Jon Loeliger and Matthew McCullough. 2012. Version Control with Git: Powerful tools and techniques for collaborative software development. O\u2019Reilly Media, Inc."},{"key":"e_1_3_3_1_31_2","doi-asserted-by":"crossref","unstructured":"Tom Mens. 2002. A state-of-the-art survey on software merging. IEEE Trans. on Software Engineering 28 5 (2002) 449\u2013462.","DOI":"10.1109\/TSE.2002.1000449"},{"key":"e_1_3_3_1_32_2","doi-asserted-by":"crossref","unstructured":"Nuthan Munaiah Steven Kroh Craig Cabrey and Meiyappan Nagappan. 2017. Curating github for engineered software projects. Empirical Software Engineering 22 (2017) 3219\u20133253.","DOI":"10.1007\/s10664-017-9512-6"},{"key":"e_1_3_3_1_33_2","doi-asserted-by":"crossref","unstructured":"Hoai\u00a0Le Nguyen and Claudia-Lavinia Ignat. 2018. An analysis of merge conflicts and resolutions in git-based open source projects. Computer Supported Cooperative Work 27 (2018) 741\u2013765.","DOI":"10.1007\/s10606-018-9323-3"},{"key":"e_1_3_3_1_34_2","first-page":"926","volume-title":"Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE)","author":"Nguyen Hung\u00a0Viet","year":"2015","unstructured":"Hung\u00a0Viet Nguyen, My\u00a0Huu Nguyen, Son\u00a0Cuu Dang, Christian K\u00e4stner, and Tien\u00a0N Nguyen. 2015. Detecting semantic merge conflicts with variability-aware execution. In Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE). 926\u2013929."},{"key":"e_1_3_3_1_35_2","volume-title":"Stack Overflow Developer Survey 2022 - Version Control Systems","author":"Overflow Stack","year":"2022","unstructured":"Stack Overflow. 2022. Stack Overflow Developer Survey 2022 - Version Control Systems. https:\/\/survey.stackoverflow.co\/2022\/#section-version-control-version-control-systems Accessed on 25 Sep 2025."},{"key":"e_1_3_3_1_36_2","doi-asserted-by":"crossref","unstructured":"Dennis Reuling Udo Kelter Johannes B\u00fcrdek and Malte Lochau. 2019. Automated n-way program merging for facilitating family-based analyses of variant-rich software. ACM Trans. on Software Engineering and Methodology 28 3 (2019) 1\u201359.","DOI":"10.1145\/3313789"},{"key":"e_1_3_3_1_37_2","doi-asserted-by":"crossref","unstructured":"Dennis Reuling Malte Lochau and Udo Kelter. 2019. From Imprecise N-Way Model Matching to Precise N-Way Model Merging. J. Object Technol. 18 2 (2019) 8\u20131.","DOI":"10.5381\/jot.2019.18.2.a8"},{"key":"e_1_3_3_1_38_2","first-page":"13","volume-title":"Proc. Int\u2019l Workshop on Comparison and Versioning of Software Models","author":"Schmidt Maik","year":"2009","unstructured":"Maik Schmidt, Sven Wenzel, Timo Kehrer, and Udo Kelter. 2009. History-based merging of models. In Proc. Int\u2019l Workshop on Comparison and Versioning of Software Models. 13\u201318."},{"key":"e_1_3_3_1_39_2","first-page":"291","volume-title":"Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE)","author":"Shao Danhua","year":"2009","unstructured":"Danhua Shao, Sarfraz Khurshid, and Dewayne\u00a0E Perry. 2009. SCA: A semantic conflict analyzer for parallel changes. In Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE). 291\u2013292."},{"key":"e_1_3_3_1_40_2","unstructured":"Bowen Shen Cihan Xiao Na Meng and Fei He. 2021. Automatic detection and resolution of software merge conflicts: Are we there yet? arXiv preprint arXiv:https:\/\/arXiv.org\/abs\/2102.11307 (2021)."},{"key":"e_1_3_3_1_41_2","first-page":"323","volume-title":"Proc. Int\u2019l Conf. on Software Maintenance and Evolution","author":"St\u0103nciulescu Stefan","year":"2016","unstructured":"Stefan St\u0103nciulescu, Thorsten Berger, Eric Walkingshaw, and Andrzej W\u0105sowski. 2016. Concepts, Operations, and Feasibility of a Projection-Based Variation Control System. In Proc. Int\u2019l Conf. on Software Maintenance and Evolution. IEEE, 323\u2013333."},{"key":"e_1_3_3_1_42_2","first-page":"822","volume-title":"Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE)","author":"Svyatkovskiy Alexey","year":"2022","unstructured":"Alexey Svyatkovskiy, Sarah Fakhoury, Negar Ghorbani, Todd Mytkowicz, Elizabeth Dinella, Christian Bird, Jinu Jang, Neel Sundaresan, and Shuvendu\u00a0K. Lahiri. 2022. Program merge conflict resolution via neural transformers. In Proc. Int\u2019l Symposium on Foundations of Software Engineering (FSE). 822\u2013833."},{"key":"e_1_3_3_1_43_2","doi-asserted-by":"crossref","unstructured":"Thomas Th\u00fcm Sven Apel Christian K\u00e4stner Ina Schaefer and Gunter Saake. 2014. A Classification and Survey of Analysis Strategies for Software Product Lines. Comput. Surveys 47 1 (2014) 6:1\u20136:45.","DOI":"10.1145\/2580950"},{"key":"e_1_3_3_1_44_2","first-page":"57","volume-title":"Proc. Int\u2019l Systems and Software Product Line Conference","author":"Th\u00fcm Thomas","year":"2019","unstructured":"Thomas Th\u00fcm, Leopoldo Teixeira, Klaus Schmid, Eric Walkingshaw, Mukelabai Mukelabai, Mahsa Varshosaz, Goetz Botterweck, Ina Schaefer, and Timo Kehrer. 2019. Towards efficient analysis of variation in time and space. In Proc. Int\u2019l Systems and Software Product Line Conference. 57\u201364."},{"key":"e_1_3_3_1_45_2","first-page":"58","volume-title":"Proc. Int\u2019l Conf. on Software Engineering (ICSE)","author":"Tichy Walter\u00a0F.","year":"1982","unstructured":"Walter\u00a0F. Tichy. 1982. Design, Implementation, and Evaluation of a Revision Control System. In Proc. Int\u2019l Conf. on Software Engineering (ICSE). 58\u201367."},{"key":"e_1_3_3_1_46_2","first-page":"251","volume-title":"Proc. Int\u2019l Conf. on Intelligent Computer Communication and Processing (ICCP)","author":"Trif Marina\u00a0Bianca","year":"2021","unstructured":"Marina\u00a0Bianca Trif and Radu\u00a0Razvan Slavescu. 2021. Towards Predicting Merge Conflicts in Software Development Environments. In Proc. Int\u2019l Conf. on Intelligent Computer Communication and Processing (ICCP). 251\u2013256."},{"key":"e_1_3_3_1_47_2","unstructured":"Gustavo Vale Claus Hunsen Eduardo Figueiredo and Sven Apel. 2022. Challenges of Resolving Merge Conflicts: A Mining and Survey Study. IEEE Trans. on Software Engineering 48 12 (2022) 4964\u20134985."},{"key":"e_1_3_3_1_48_2","volume-title":"JuJutsu - Version Control Systems","author":"Zweigbergk Martin von","year":"2026","unstructured":"Martin von Zweigbergk. 2026. JuJutsu - Version Control Systems. https:\/\/jj-vcs.dev\/ Accessed on 07 Jan 2026."},{"key":"e_1_3_3_1_49_2","doi-asserted-by":"publisher","DOI":"10.5555\/2349018"},{"key":"e_1_3_3_1_50_2","first-page":"21","volume-title":"Proc. Int\u2019l Workshop on Software Analytics","author":"Yuzuki Ryohei","year":"2015","unstructured":"Ryohei Yuzuki, Hideaki Hata, and Kenichi Matsumoto. 2015. How we resolve conflict: an empirical study of method-level conflict resolution. In Proc. Int\u2019l Workshop on Software Analytics. IEEE, 21\u201324."},{"key":"e_1_3_3_1_51_2","first-page":"77","volume-title":"Proc. Int\u2019l Symp. on Software Testing and Analysis","author":"Zhang Jialu","year":"2022","unstructured":"Jialu Zhang, Todd Mytkowicz, Mike Kaufman, Ruzica Piskac, and Shuvendu\u00a0K Lahiri. 2022. Using pre-trained language models to resolve textual and semantic merge conflicts. In Proc. Int\u2019l Symp. on Software Testing and Analysis. 77\u201388."}],"event":{"name":"ICSE-NIER '26: 2026 IEEE\/ACM 48th International Conference on Software Engineering","location":"Rio de Janeiro Brazil","acronym":"ICSE-NIER '26","sponsor":["SIGSOFT ACM Special Interest Group on Software Engineering"]},"container-title":["Proceedings of the IEEE\/ACM 48th International Conference on Software Engineering"],"original-title":[],"link":[{"URL":"https:\/\/dl.acm.org\/doi\/pdf\/10.1145\/3786582.3786840","content-type":"unspecified","content-version":"vor","intended-application":"similarity-checking"}],"deposited":{"date-parts":[[2026,7,8]],"date-time":"2026-07-08T11:54:55Z","timestamp":1783511695000},"score":1,"resource":{"primary":{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3786582.3786840"}},"subtitle":[],"short-title":[],"issued":{"date-parts":[[2026,4,12]]},"references-count":50,"alternative-id":["10.1145\/3786582.3786840","10.1145\/3786582"],"URL":"https:\/\/doi.org\/10.1145\/3786582.3786840","relation":{},"subject":[],"published":{"date-parts":[[2026,4,12]]},"assertion":[{"value":"2026-07-08","order":3,"name":"published","label":"Published","group":{"name":"publication_history","label":"Publication History"}}]}}