Evaluating and improving semistructured merge
Open accessThe DOI matches its Crossref record; 1 of the 1 references it cites were found in a registry or an index.
Abstract
While unstructured merge tools rely only on textual analysis to detect and resolve conflicts, semistructured merge tools go further by partially exploiting the syntactic structure and semantics of the involved artifacts. Previous studies compare these merge approaches with respect to the number of reported conflicts, showing, for most projects and merge situations, reduction in favor of semistructured merge. However, these studies do not investigate whether this reduction actually leads to integration effort reduction (productivity) without negative impact on the correctness of the merging process (quality). To analyze that, and better understand how merge tools could be improved, in this paper we reproduce more than 30,000 merges from 50 open source projects, identifying conflicts incorrectly reported by one approach but not by the other (false positives), and conflicts correctly reported by one approach but missed by the other (false negatives). Our results and complementary analysis indicate that, in the studied sample, the number of false positives is significantly reduced when using semistructured merge. We also find evidence that its false positives are easier to analyze and resolve than those reported by unstructured merge. However, we find no evidence that semistructured merge leads to fewer false negatives, and we argue that they are harder to detect and resolve than unstructured merge false negatives. Driven by these findings, we implement an improved semistructured merge tool that further combines both approaches to reduce the false positives and false negatives of semistructured merge. We find evidence that the improved tool, when compared to unstructured merge in our sample, reduces the number of reported conflicts by half, has no additional false positives, has at least 8% fewer false negatives, and is not prohibitively slower.
Overview
The claims and statistics of this paper haven’t been checked yet.
Free: it reads the open-access text and checks the first 5 claims that cite a source we can check. Create a free account to check every claim.
Integrity signals
Registry
Cites
Statistics
Verification
Claims the paper makes
The claims and statistics of this paper haven’t been checked yet.
Free: it reads the open-access text and checks the first 5 claims that cite a source we can check. Create a free account to check every claim.
Self-check
Percentages, sums and reported differences re-computed from the paper’s own numbers.
The self-check needs the paper’s full text.
Citations
Cites
The promises and perils of mining git
Bird, C., Rigby, P. C., Barr, E. T., Hamilton, D. J., German, D. M., & Devanbu, P. (2009) · 2009 6th IEEE International Working Conference on Mining Software Repositories · doi:10.1109/msr.2009.5069475 · Cited by 311
Cited by
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
“[44] used the findings from their previous study to improve their semi-structured merge technique to address conflicts involving import declarations and initialization blocks.”
MethodUnderstanding semi-structured merge conflict characteristics in open-source Java projects
Accioly, P., Borba, P., & Cavalcanti, G. (2018) · Empirical Software Engineering · doi:10.1007/s10664-017-9586-1 · Cited by 48
Self-citationProgram merge conflict resolution via neural transformers
Svyatkovskiy, A., Fakhoury, S., Ghorbani, N., Mytkowicz, T., Dinella, E., Bird, C., Jang, J., Sundaresan, N., & Lahiri, S. K. (2022) · Proceedings of the 30th ACM Joint European Software Engineering Conference and Symposium on the Foundations of Software Engineering · doi:10.1145/3540250.3549163 · Cited by 38
“Over the past decade, several approaches have been proposed to improve the detection and automatic resolution of merge conflicts [4, 9, 10, 28, 30, 32, 45, 53].”
BackgroundCauses of merge conflicts: a case study of ElasticSearch
Mahmood, W., Chagama, M., Berger, T., & Hebig, R. (2020) · Proceedings of the 14th International Working Conference on Variability Modelling of Software-Intensive Systems · doi:10.1145/3377024.3377047 · Cited by 10
Towards a Feasible Evaluation Function for Search-Based Merge Conflict Resolution
de Souza Campos, H., de Menezes, G. G. L., de Oliveira Barros, M., van der Hoek, A., & Gresta Paulino Murta, L. (2026) · ACM Transactions on Software Engineering and Methodology · doi:10.1145/3748256 · Cited by 1
Metadata
- Authors
- Cavalcanti, G., Borba, P., & Accioly, P.
- Venue
- Proceedings of the ACM on Programming Languages
- Published
- 2017-10-12
- Volume
- 1
- Issue
- OOPSLA
- Pages
- 1-27
- ISSN
- 2475-1421 (ISSN-L)
- OpenAlex
- W2761459579
- Cited by
- 67
- References
- 1
- FWCI
- 12.74
- Type
- journal article
- Language
- en
- Open access
- bronze
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
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.