Semistructured merge: rethinking merge in revision control systems
The DOI matches its Crossref record; 1 of the 1 references it cites were found in a registry or an index.
Abstract
An ongoing problem in revision control systems is how to resolve conflicts in a merge of independently developed revisions. Unstructured revision control systems are purely text-based and solve conflicts based on textual similarity. Structured revision control systems are tailored to specific languages and use language-specific knowledge for conflict resolution. We propose semistructured revision control systems that inherit the strengths of both: the generality of unstructured systems and the expressiveness of structured systems. The idea is to provide structural information of the underlying software artifacts --- declaratively, in the form of annotated grammars. This way, a wide variety of languages can be supported and the information provided can assist in the automatic resolution of two classes of conflicts: ordering conflicts and semantic conflicts. The former can be resolved independently of the language and the latter using specific conflict handlers. We have been developing a tool that supports semistructured merge and conducted an empirical study on 24 software projects developed in Java, C#, and Python comprising 180 merge scenarios. We found that semistructured merge reduces the number of conflicts in 60% of the sample merge scenarios by, on average, 34%, compared to unstructured merge. We found also that renaming is challenging in that it can increase the number of conflicts during semistructured merge, and that a combination of unstructured and semistructured merge is a pragmatic way to go.
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
Making sense of revision-control systems
O'Sullivan, B. (2009) · Communications of the ACM · doi:10.1145/1562164.1562183 · Cited by 61
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
“Hybrid approaches that mix aspects of both unstructured and structured techniques have been explored as well [2], [18], [19].”
BackgroundMethodUnderstanding 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
Program 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
“8.2.4 jsFSTMerge.”
MethodInfluentialCauses 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
- Apel, S., Liebig, J., Brandl, B., Lengauer, C., & Kästner, C.
- Venue
- Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering
- Publisher
- ACM
- Published
- 2011-09-09
- Pages
- 190-200
- OpenAlex
- W2007267771
- Cited by
- 113
- References
- 1
- FWCI
- 3.37
- Type
- conference paper
- Language
- en
- Open access
- closed
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: Semistructured merge: rethinking merge in revision control systems. https://app.cochat.ai/papers/10.1145/2025113.2025141
- The paper
- Apel, S., Liebig, J., Brandl, B., Lengauer, C., & Kästner, C. (2011). Semistructured merge: rethinking merge in revision control systems. Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering. https://doi.org/10.1145/2025113.2025141
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.