Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution
ACM Transactions on Software Engineering and Methodology · 31.05.2026 · 35 (5) · 1-35
DOI: 10.1145/3748256 ↗Kurz gefasst
Fachartikel in der Zeitschrift ACM Transactions on Software Engineering and Methodology, online erschienen am 24.04.2026. Verfasst von Heleno de Souza Campos und 4 weiteren Autor:innen. Die Arbeit wurde bisher 2-mal zitiert (Crossref) und nennt 29 Literaturangaben. Gefördert von: Conselho Nacional de Desenvolvimento Científico e Tecnológico, National Science Foundation, Fundação Carlos Chagas Filho de Amparo à Pesquisa do Estado do Rio de Janeiro.
Abstract (Originalsprache)
Resolving merge conflicts manually is a tedious and complex task. While automated approaches exist, many challenges persist. One promising yet underexplored solution is the use of search-based optimization algorithms, which require an evaluation function to measure the quality of intermediary solutions. However, using code compilation and test execution for this purpose is computationally expensive. This study investigates the relationship between conflict resolutions and conflicting content to identify a metric for guiding search-based optimization techniques. We analyzed 9,998 conflict chunks from 1,062 open source projects, focusing on the similarity of resolutions to their parents and the correlation between randomly generated candidates, parent versions, and the resolution. Our findings reveal that conflict resolutions are, on average, 70% similar to both parents. A strong median correlation ( \(\rho=0.791\) ) exists between candidate-parent and candidate-resolution similarities when aggregating parent similarities with the mean function. Based on these findings, we propose and evaluate SBCR, a Search-Based Conflict Resolution approach that uses parent similarity as a guiding function. We found that the resolution candidates generated by SBCR have a median of 86.5% similarity to the expected resolution, achieving 100% of similarity in 25.2% of the conflicts.
Förderung
- Conselho Nacional de Desenvolvimento Científico e Tecnológico
- National Science Foundation
- Fundação Carlos Chagas Filho de Amparo à Pesquisa do Estado do Rio de Janeiro
Zitieren
APA
Campos, H. D. S., Menezes, G. G. L. D., Barros, M. D. O., Hoek, A. V. D., & Murta, L. G. P. (2026). Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution. ACM Transactions on Software Engineering and Methodology, 35(5), 1-35. https://doi.org/10.1145/3748256
Vancouver
Campos HDS, Menezes GGLD, Barros MDO, Hoek AVD, Murta LGP. Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution. ACM Transactions on Software Engineering and Methodology. 2026;35(5):1-35. doi:10.1145/3748256
BibTeX
@article{Campos2026,
author = {Campos, Heleno de Souza and Menezes, Gleiph Ghiotto L. de and Barros, Márcio de Oliveira and Hoek, André van der and Murta, Leonardo Gresta Paulino},
title = {Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution},
journal = {ACM Transactions on Software Engineering and Methodology},
year = {2026},
volume = {35},
number = {5},
pages = {1--35},
doi = {10.1145/3748256}
}
EUVIMED