{"status":"ok","message-type":"work","message-version":"1.0.0","message":{"indexed":{"date-parts":[[2025,8,23]],"date-time":"2025-08-23T00:06:51Z","timestamp":1755907611458,"version":"3.44.0"},"publisher-location":"New York, NY, USA","reference-count":34,"publisher":"ACM","license":[{"start":{"date-parts":[[2024,6,18]],"date-time":"2024-06-18T00:00:00Z","timestamp":1718668800000},"content-version":"vor","delay-in-days":0,"URL":"https:\/\/creativecommons.org\/licenses\/by-nc-sa\/4.0\/"}],"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":[[2024,6,18]]},"DOI":"10.1145\/3661167.3661197","type":"proceedings-article","created":{"date-parts":[[2024,6,14]],"date-time":"2024-06-14T12:24:25Z","timestamp":1718367865000},"page":"282-292","update-policy":"https:\/\/doi.org\/10.1145\/crossmark-policy","source":"Crossref","is-referenced-by-count":1,"title":["Towards Semi-Automated Merge Conflict Resolution: Is It Easier Than We Expected?"],"prefix":"10.1145","author":[{"ORCID":"https:\/\/orcid.org\/0000-0002-9881-9748","authenticated-orcid":false,"given":"Alexander","family":"Boll","sequence":"first","affiliation":[{"name":"University of Bern, Switzerland"}]},{"ORCID":"https:\/\/orcid.org\/0009-0006-0084-7414","authenticated-orcid":false,"given":"Yael","family":"Van Dok","sequence":"additional","affiliation":[{"name":"University of Bern, Switzerland"}]},{"ORCID":"https:\/\/orcid.org\/0009-0002-2135-1136","authenticated-orcid":false,"given":"Manuel","family":"Ohrndorf","sequence":"additional","affiliation":[{"name":"University of Bern, Switzerland"}]},{"ORCID":"https:\/\/orcid.org\/0000-0002-1509-1449","authenticated-orcid":false,"given":"Alexander","family":"Schulthei\u00df","sequence":"additional","affiliation":[{"name":"Paderborn University, Germany"}]},{"ORCID":"https:\/\/orcid.org\/0000-0002-2582-5557","authenticated-orcid":false,"given":"Timo","family":"Kehrer","sequence":"additional","affiliation":[{"name":"University of Bern, Switzerland"}]}],"member":"320","published-online":{"date-parts":[[2024,6,18]]},"reference":[{"key":"e_1_3_2_1_1_1","unstructured":"[1] 18-01-2024. https:\/\/zenodo.org\/records\/10511517."},{"key":"e_1_3_2_1_2_1","unstructured":"[2] 18-01-2024. https:\/\/docs.github.com\/en\/rest?apiVersion=2022-11-28."},{"key":"e_1_3_2_1_3_1","unstructured":"[3] 18-01-2024. https:\/\/eclipse.dev\/jgit."},{"key":"e_1_3_2_1_4_1","unstructured":"[4] 18-01-2024. https:\/\/madnight.github.io\/githut\/#\/stars\/2023\/3."},{"key":"e_1_3_2_1_5_1","unstructured":"[5] 18-01-2024. https:\/\/github.com\/github-linguist\/linguist."},{"key":"e_1_3_2_1_6_1","unstructured":"[6] 18-01-2024. https:\/\/git-scm.com\/docs\/git-merge."},{"key":"e_1_3_2_1_7_1","doi-asserted-by":"publisher","DOI":"10.1145\/1826147.1826156"},{"key":"e_1_3_2_1_8_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2013.28"},{"volume-title":"The Impact of Structure on Software Merging: Semistructured Versus Structured Merge","author":"Cavalcanti Guilherme","key":"e_1_3_2_1_9_1","unstructured":"Guilherme Cavalcanti, Paulo Borba, Georg Seibt, and Sven Apel. 2019. The Impact of Structure on Software Merging: Semistructured Versus Structured Merge. In ASE. IEEE, 1002\u20131013."},{"volume-title":"MODELS(LNCS, Vol.\u00a05301)","author":"Cicchetti Antonio","key":"e_1_3_2_1_10_1","unstructured":"Antonio Cicchetti, Davide\u00a0Di Ruscio, and Alfonso Pierantonio. 2008. Managing Model Conflicts in Distributed Development. In MODELS(LNCS, Vol.\u00a05301). Springer, 311\u2013325."},{"key":"e_1_3_2_1_11_1","doi-asserted-by":"publisher","DOI":"10.1145\/280277.280280"},{"key":"e_1_3_2_1_12_1","volume-title":"Comparing the Pearson and Spearman Correlation Coefficients Across Distributions and Sample Sizes: A Tutorial Using Simulations and Empirical Data. Psychological methods 21, 3","author":"De\u00a0Winter CF","year":"2016","unstructured":"Joost\u00a0CF De\u00a0Winter, Samuel\u00a0D Gosling, and Jeff Potter. 2016. Comparing the Pearson and Spearman Correlation Coefficients Across Distributions and Sample Sizes: A Tutorial Using Simulations and Empirical Data. Psychological methods 21, 3 (2016), 273."},{"key":"e_1_3_2_1_13_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2022.3183955"},{"volume-title":"Awareness and Merge Conflicts in Distributed Software Development","author":"Estler Christian","key":"e_1_3_2_1_14_1","unstructured":"H.-Christian Estler, Martin Nordio, Carlo\u00a0A. Furia, and Bertrand Meyer. 2014. Awareness and Merge Conflicts in Distributed Software Development. In ICGE. IEEE, 26\u201335."},{"key":"e_1_3_2_1_15_1","doi-asserted-by":"publisher","DOI":"10.1145\/1101815.1101817"},{"key":"e_1_3_2_1_16_1","volume-title":"On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub. TSE 46, 8","author":"Ghiotto Gleiph","year":"2020","unstructured":"Gleiph Ghiotto, Leonardo Murta, M\u00e1rcio de Oliveira\u00a0Barros, 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. TSE 46, 8 (2020), 892\u2013915."},{"volume-title":"Improving Early Detection of Software Merge Conflicts","author":"Guimar\u00e3es M\u00e1rio\u00a0Lu\u00eds","key":"e_1_3_2_1_17_1","unstructured":"M\u00e1rio\u00a0Lu\u00eds Guimar\u00e3es and Ant\u00f3nio\u00a0Rito Silva. 2012. Improving Early Detection of Software Merge Conflicts. In ICSE. IEEE, 342\u2013352."},{"key":"e_1_3_2_1_18_1","volume-title":"Cassandra: Proactive Conflict Minimization through Optimized Task Scheduling. In ICSE, David Notkin, Betty H.\u00a0C","author":"Kasi Bakhtiar\u00a0Khan","year":"2013","unstructured":"Bakhtiar\u00a0Khan Kasi and Anita Sarma. 2013. Cassandra: Proactive Conflict Minimization through Optimized Task Scheduling. In ICSE, David Notkin, Betty H.\u00a0C. Cheng, and Klaus Pohl (Eds.). IEEE, 732\u2013741."},{"key":"e_1_3_2_1_19_1","unstructured":"Petra Kaufmann Horst Kargl Philip Langer Martina Seidl Konrad Wieland Manuel Wimmer and Gerti Kappel. 2010. Representation and Visualization of Merge Conflicts with UML Profiles. In ME. 53\u201362."},{"volume-title":"A Formal Investigation of Diff3","author":"Khanna Sanjeev","key":"e_1_3_2_1_20_1","unstructured":"Sanjeev Khanna, Keshav Kunal, and Benjamin\u00a0C Pierce. 2007. A Formal Investigation of Diff3. In FFTTCS. Springer, 485\u2013496."},{"key":"e_1_3_2_1_21_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2022.3143766"},{"volume-title":"Renaming and Shifted Code in Structured Merging: Looking Ahead for Precision and Performance","author":"Le\u00dfenich Olaf","key":"e_1_3_2_1_22_1","unstructured":"Olaf Le\u00dfenich, Sven Apel, Christian K\u00e4stner, Georg Seibt, and Janet Siegmund. 2017. Renaming and Shifted Code in Structured Merging: Looking Ahead for Precision and Performance. In ASE. IEEE, 543\u2013553."},{"key":"e_1_3_2_1_23_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2002.1000449"},{"key":"e_1_3_2_1_24_1","volume-title":"The life-cycle of merge conflicts: processes, barriers, and strategies. 24, 5","author":"Nelson Nicholas","year":"2019","unstructured":"Nicholas Nelson, Caius Brindescu, Shane McKee, Anita Sarma, and Danny Dig. 2019. The life-cycle of merge conflicts: processes, barriers, and strategies. 24, 5 (2019), 2863\u20132906."},{"key":"e_1_3_2_1_25_1","first-page":"3","article-title":"An Analysis of Merge Conflicts and Resolutions in Git-Based Open Source Projects","volume":"27","author":"Nguyen Hoai\u00a0Le","year":"2018","unstructured":"Hoai\u00a0Le Nguyen and Claudia-Lavinia Ignat. 2018. An Analysis of Merge Conflicts and Resolutions in Git-Based Open Source Projects. CSCW 27, 3-6 (2018), 741\u2013765.","journal-title":"CSCW"},{"volume-title":"Can Program Synthesis be Used to Learn Merge Conflict Resolutions? An Empirical Analysis","author":"Pan Rangeet","key":"e_1_3_2_1_26_1","unstructured":"Rangeet Pan, Vu Le, Nachiappan Nagappan, Sumit Gulwani, Shuvendu\u00a0K. Lahiri, and Mike Kaufman. 2021. Can Program Synthesis be Used to Learn Merge Conflict Resolutions? An Empirical Analysis. In ICSE. IEEE, 785\u2013796."},{"key":"e_1_3_2_1_27_1","doi-asserted-by":"publisher","DOI":"10.1109\/TSE.2021.3123143"},{"key":"e_1_3_2_1_28_1","volume-title":"Automatic Detection and Resolution of Software Merge Conflicts: Are We There Yet?CoRR abs\/2102.11307","author":"Shen Bowen","year":"2021","unstructured":"Bowen Shen, Cihan Xiao, Na Meng, and Fei He. 2021. Automatic Detection and Resolution of Software Merge Conflicts: Are We There Yet?CoRR abs\/2102.11307 (2021). arXiv:2102.11307"},{"key":"e_1_3_2_1_29_1","volume-title":"OOPSLA","author":"Sousa Marcelo","year":"2018","unstructured":"Marcelo Sousa, Isil Dillig, and Shuvendu\u00a0K Lahiri. 2018. Verified Three-Way Program Merge. PACMPL 2, OOPSLA (2018), 1\u201329."},{"key":"e_1_3_2_1_30_1","doi-asserted-by":"crossref","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 ESEC\/FSE. ACM 822\u2013833.","DOI":"10.1145\/3540250.3549163"},{"key":"e_1_3_2_1_31_1","first-page":"2","article-title":"Turning Conflicts into Collaboration","volume":"22","author":"Wieland Konrad","year":"2013","unstructured":"Konrad Wieland, Philip Langer, Martina Seidl, Manuel Wimmer, and Gerti Kappel. 2013. Turning Conflicts into Collaboration. CSCW 22, 2-3 (2013), 181\u2013240.","journal-title":"CSCW"},{"volume-title":"How We Resolve Conflict: An Empirical Study of Method-Level Conflict Resolution","author":"Yuzuki Ryohei","key":"e_1_3_2_1_32_1","unstructured":"Ryohei Yuzuki, Hideaki Hata, and Kenichi Matsumoto. 2015. How We Resolve Conflict: An Empirical Study of Method-Level Conflict Resolution. In SWAN. IEEE, 21\u201324."},{"volume-title":"Enhancing Precision of Structured Merge by Proper Tree Matching","author":"Zhu Fengmin","key":"e_1_3_2_1_33_1","unstructured":"Fengmin Zhu, Fei He, and Qianshan Yu. 2019. Enhancing Precision of Structured Merge by Proper Tree Matching. In ICSE. IEEE, 286\u2013287."},{"volume-title":"Mining Workspace Updates in CVS","author":"Zimmermann Thomas","key":"e_1_3_2_1_34_1","unstructured":"Thomas Zimmermann. 2007. Mining Workspace Updates in CVS. In MSR. IEEE, 11."}],"event":{"name":"EASE 2024: 28th International Conference on Evaluation and Assessment in Software Engineering","acronym":"EASE 2024","location":"Salerno Italy"},"container-title":["Proceedings of the 28th International Conference on Evaluation and Assessment in Software Engineering"],"original-title":[],"link":[{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3661167.3661197","content-type":"unspecified","content-version":"vor","intended-application":"text-mining"},{"URL":"https:\/\/dl.acm.org\/doi\/pdf\/10.1145\/3661167.3661197","content-type":"unspecified","content-version":"vor","intended-application":"similarity-checking"}],"deposited":{"date-parts":[[2025,8,22]],"date-time":"2025-08-22T11:13:18Z","timestamp":1755861198000},"score":1,"resource":{"primary":{"URL":"https:\/\/dl.acm.org\/doi\/10.1145\/3661167.3661197"}},"subtitle":[],"short-title":[],"issued":{"date-parts":[[2024,6,18]]},"references-count":34,"alternative-id":["10.1145\/3661167.3661197","10.1145\/3661167"],"URL":"https:\/\/doi.org\/10.1145\/3661167.3661197","relation":{},"subject":[],"published":{"date-parts":[[2024,6,18]]},"assertion":[{"value":"2024-06-18","order":3,"name":"published","label":"Published","group":{"name":"publication_history","label":"Publication History"}}]}}