Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution
The DOI matches its Crossref record; 27 of the 27 references it cites were found in a registry or an index.
Abstract
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.
Overview
Integrity signals
Registry
Cites
Statistics
Verification
Claims the paper makes
Claims other papers make about this one
Each is checked against this paper’s own text: does it say what the citing paper says it does?
In the citing paper
“datasets like those used in SBCR [12] focus on the textual similarity between conflict resolutions and their parent versions, offering nearly 10,000 conflict chunks for 1,062 Java projects.”
From AgenticFlict: A Large-Scale Dataset of Merge Conflicts in AI Coding Agent Pull Requests on GitHub (2026) · cites this paper as [12]
Citations
Cites
Applied Statistics for the Behavioral Sciences
Witz, K., Hinkle, D. E., Wiersma, W., & Jurs, S. G. (1990) · Journal of Educational Statistics · doi:10.2307/1164825 · Cited by 2,913
A linear space algorithm for computing maximal common subsequences
Hirschberg, D. S. (1975) · Communications of the ACM · doi:10.1145/360825.360861 · Cited by 1,093
Search-based software engineering
Harman, M., & Jones, B. F. (2001) · Information and Software Technology · doi:10.1016/s0950-5849(01)00189-6 · Cited by 914
A state-of-the-art survey on software merging
Mens, T. (2002) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2002.1000449 · Cited by 532
Artificial Intelligence - A Modern Approach
Sonawane, A. D., Midhun Moorthi, C., Gnanamurthy, R. K., & Sathya, M. C. (2023) · Zenodo (CERN European Organization for Nuclear Research) · doi:10.5281/zenodo.8177105 · Cited by 201
Semistructured merge: rethinking merge in revision control systems
Apel, S., Liebig, J., Brandl, B., Lengauer, C., & Kästner, C. (2011) · Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering · doi:10.1145/2025113.2025141 · Cited by 113
Structured merge with auto-tuning: balancing precision and performance
Apel, S., Leßenich, O., & Lengauer, C. (2012) · Proceedings of the 27th IEEE/ACM International Conference on Automated Software Engineering · doi:10.1145/2351676.2351694 · Cited by 94
Cassandra: Proactive conflict minimization through optimized task scheduling
Kasi, B. K., & Sarma, A. (2013) · 2013 35th International Conference on Software Engineering (ICSE) · doi:10.1109/icse.2013.6606619 · Cited by 81
Evaluating and improving semistructured merge
Cavalcanti, G., Borba, P., & Accioly, P. (2017) · Proceedings of the ACM on Programming Languages · doi:10.1145/3133883 · Cited by 67
On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub
Ghiotto, G., Murta, L., Barros, M., & van der Hoek, A. (2020) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2018.2871083 · Cited by 67
Self-citation
Research works printed but not linked: 2
- 10.5555/2486788.2486884 · doi:10.5555/2486788.2486884
- John W. Ratcliff and David E. Metzener. 1988. Pattern matching: The gestalt approach. Dr. Dobb’s Journal 13, 7 (1988), 46.
Cited by
AgenticFlict: A Large-Scale Dataset of Merge Conflicts in AI Coding Agent Pull Requests on GitHub
Ogenrwot, D., & Businge, J. (2026) · Proceedings of the 3rd ACM International Conference on AI-Powered Software · doi:10.1145/3805760.3814923
Metadata
- Authors
- de Souza Campos, H., de Menezes, G. G. L., de Oliveira Barros, M., van der Hoek, A., & Gresta Paulino Murta, L.
- Affiliations
- Universidade Federal Fluminense, Niterói, Brazil
- Universidade Federal de Juiz de Fora, Juiz de Fora, Brazil
- Universidade Federal do Estado do Rio de Janeiro, Rio de Janeiro, Brazil
- University of California, Irvine, Irvine, California, USA
- ORCID
- Venue
- ACM Transactions on Software Engineering and Methodology
- Published
- 2026-04-24
- Volume
- 35
- Issue
- 5
- Pages
- 1-35
- ISSN
- 1049-331X (ISSN-L)
- 1557-7392
- OpenAlex
- W4412400182
- Cited by
- 1
- References
- 27
- Citations by year
- 2026: 1
- FWCI
- 0.64
- Type
- journal article
- Language
- en
- Open access
- closed
- Locations
- ACM Transactions on Software Engineering and Methodology (publishedVersion)
- Funders
- Conselho Nacional de Desenvolvimento Científico e Tecnológico (309300/2023-1)
- National Science Foundation (CCF-2210812)
- Fundação Carlos Chagas Filho de Amparo à Pesquisa do Estado do Rio de Janeiro (E-26/210.542/2024, E-26/204.145/2024)
- Topics
- Physical Sciences › Computer Science › Information Systems › Software Engineering Research
- Physical Sciences › Computer Science › Information Systems › Software Engineering Techniques and Practices
- Physical Sciences › Computer Science › Software › Software Testing and Debugging Techniques
- Keywords
- merge conflict resolution, evaluation function, search-based optimization, version control, open source projects
About these checks
Registry, retraction, Cites and statistics results are computed, not judged, with one exception: a printed reference that no index lists is read once by a model before it counts as a citation error. Claims are extracted by a model and kept only when their quote appears verbatim in the text; each cited source is then checked, with a model’s help, for whether it says what the claim relies on. Those verdicts can be wrong — read the claim’s quote and the cited source before relying on one.
Statistics and arithmetic are recomputed, not judged.
Confidence bands are shown only for fields calibrated on our annotated test set. None is calibrated yet, so no band is shown.
What counts as a claim ›How we measure confidence ›How we check this ›
Are you an author, or do you see a problem with this page? Request a review
How to cite
Cite CoChat for the checks on this page, and the paper for its own findings.
- This page
- CoChat. (2026). Citation check: Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution. https://app.cochat.ai/papers/10.1145/3748256
- The paper
- de Souza Campos, H., de Menezes, G. G. L., de Oliveira Barros, M., van der Hoek, A., & Gresta Paulino Murta, L. (2026). Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution. ACM Transactions on Software Engineering and Methodology. https://doi.org/10.1145/3748256
Data sources
Bibliographic data: Semantic Scholar, OpenAlex, Crossref.
Contains information from the Semantic Scholar Academic Graph Datasets, made available under the ODC Attribution License (ODC-BY 1.0).
Semantic Scholar’s data is described in: Kinney, R., et al. (2023). The Semantic Scholar Open Data Platform. arXiv:2301.10140.