The DOI matches its Crossref record; 47 of the 48 references it cites were found in a registry or an index.
On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub
Abstract
When multiple developers change a software system in parallel, these concurrent changes need to be merged to all appear in the software being developed. Numerous merge techniques have been proposed to support this task, but none of them can fully automate the merge process. Indeed, it has been reported that as much as 10 to 20 percent of all merge attempts result in a merge conflict, meaning that a developer has to manually complete the merge. To date, we have little insight into the nature of these merge conflicts. What do they look like, in detail? How do developers resolve them? Do any patterns exist that might suggest new merge techniques that could reduce the manual effort? This paper contributes an in-depth study of the merge conflicts found in the histories of 2,731 open source Java projects. Seeded by the manual analysis of the histories of five projects, our automated analysis of all 2,731 projects: (1) characterizes the merge conflicts in terms of number of chunks, size, and programming language constructs involved, (2) classifies the manual resolution strategies that developers use to address these merge conflicts, and (3) analyzes the relationships between various characteristics of the merge conflicts and the chosen resolution strategies. Our results give rise to three primary recommendations for future merge techniques, that - when implemented - could on one hand help in automatically resolving certain types of conflicts and on the other hand provide the developer with tool-based assistance to more easily resolve other types of conflicts that cannot be automatically resolved.
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
“Traditional benchmarks focus on human-authored conflicts at scale, such as the 2,731 Java-based projects studied by Ghiotto et al. [18], reporting that nearly 20% of merges require manual intervention”
From AgenticFlict: A Large-Scale Dataset of Merge Conflicts in AI Coding Agent Pull Requests on GitHub (2026) · cites this paper as [18]
Citations
Cites
AnO(ND) difference algorithm and its variations
Myers, E. W. (1986) · Algorithmica · doi:10.1007/bf01840446 · Cited by 893
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 · cited 3×
“A traditional approach to do so is to apply a merge tool, which implements some underlying merge technique that aims to automate as much as possible of the task of combining parallel changes [1].”
BackgroundMethodInfluentialContinuous Integration: Improving Software Quality and Reducing Risk
Duvall, P., Matyas, S., & Glover, A. (2007) · Cited by 510
An Algorithm for Differential File Comparison
Hunt, J. W., & McIlroy, M. D. (2008) · Cited by 296
FASTDash: a visual dashboard for fostering awareness in software teams
Biehl, J. T., Czerwinski, M., Smith, G., & Robertson, G. G. (2007) · Proceedings of the SIGCHI Conference on Human Factors in Computing Systems · doi:10.1145/1240624.1240823 · Cited by 260 · cited 1×
“CASI [34], CloudStudio [35], CoDesign [36], CollabVS [37], Crystal [22], FastDash [38], Palantír [39], SafeCommit [40], Syde [41], and WeCode [42] all monitor developer workspaces to detect when two developers begin modifying the same file or different files that exhibit some syntactic or semantic dependency.”
BackgroundData consistency for P2P collaborative editing
Oster, G., Urso, P., Molli, P., & Imine, A. (2006) · Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work · doi:10.1145/1180875.1180916 · Cited by 215 · cited 2×
“A significant number of merge techniques rely on lines of code as the basis; these techniques are called unstructured merge techniques [3]–[8].”
BackgroundProactive detection of collaboration conflicts
Brun, Y., Holmes, R., Ernst, M. D., & Notkin, D. (2011) · Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering · doi:10.1145/2025113.2025139 · Cited by 201 · cited 5×
“, merge, build, or test failure) [22], [23].”
BackgroundInfluentialMiller, W., & Myers, E. W. (1985) · Software: Practice and Experience · doi:10.1002/spe.4380151102 · Cited by 186 · cited 2×
“, [3], [4], [5], [6], [7], [8]) were unstructured, prioritizing performance and generality over precision.”
BackgroundMethodSemantic Diff: a tool for summarizing the effects of modifications
Jackson, & Ladd (1994) · Proceedings International Conference on Software Maintenance ICSM-94 · doi:10.1109/icsm.1994.336770 · Cited by 185 · cited 2×
“Other, more complex techniques have also been developed, some relying on syntax [9]–[15] and others on semantics [16], [17]; these techniques are termed structured merge techniques.”
BackgroundMethodChacon, S. (2009) · Apress eBooks · doi:10.1007/978-1-4302-1834-0 · Cited by 164
Research works printed but not linked: 1
- berlin, 2006, Practical Subversion
Cited by
IntelliMerge: a refactoring-aware software merging technique
Shen, B., Zhang, W., Zhao, H., Liang, G., Jin, Z. G., & Wang, Q. (2019) · Proceedings of the ACM on Programming Languages · doi:10.1145/3360596 · Cited by 64
“Although resolving all conflicts automatically without human intervention is suggested to be infeasible by [Menezes et al. 2018] through a large-scale empirical study, reducing the number of false positive merge conflicts does save developers’ effort and time in the manual resolution process.”
BackgroundUsing pre-trained language models to resolve textual and semantic merge conflicts (experience paper)
Zhang, J., Mytkowicz, T., Kaufman, M., Piskač, R., & Lahiri, S. K. (2022) · ACM SIGSOFT International Symposium on Software Testing and Analysis (ISSTA) · doi:10.1145/3533767.3534396 · Cited by 58
“Recent studies [7, 9] have shown that such a bad merge in the code delayed the development cycle or caused damage by simply leaving bugs in the code.”
BackgroundResultInfluentialPredicting Merge Conflicts in Collaborative Software Development
Owhadi-Kareshk, M., Nadi, S., & Rubin, J. (2019) · Proceedings of the ... ACM-IEEE International Symposium on Empirical Software Engineering and Measurement/International Symposium on Empirical Software Engineering and Measurement · doi:10.1109/esem.2019.8870173 · Cited by 65
“[28] also investigated various characteristics of textual merge conflicts, such as their size and resolution types.”
BackgroundBogomolov, E., Kovalenko, V., Rebryk, Y., Bacchelli, A., & Bryksin, T. (2021) · ACM Joint European Software Engineering Conference and Symposium on the Foundations of Software Engineering (ESEC/FSE) · doi:10.1145/3468264.3468606 · Cited by 51
“Open-source Git repositories, and GitHub in particular, are a uniquely rich source of data for modern software engineering research efforts [8, 17, 32, 42].”
BackgroundDeepMerge: Learning to Merge Programs
Dinella, E., Mytkowicz, T., Svyatkovskiy, A., Bird, C., Naik, M., & Lahiri, S. K. (2022) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2022.3183955 · Cited by 48
Metadata
- Authors
- Ghiotto, G., Murta, L., Barros, M., & van der Hoek, A.
- Affiliations
- Universidade Federal de Juiz de Fora (BR)
- Universidade Federal Fluminense (BR)
- Venue
- IEEE Transactions on Software Engineering
- Published
- 2020-08-01
- Volume
- 46
- Issue
- 8
- Pages
- 892-915
- ISSN
- 0098-5589 (ISSN-L)
- 1939-3520
- 2326-3881
- OpenAlex
- W2890081359
- Cited by
- 67
- References
- 48
- Citations by year
- 2026: 5 · 2025: 7 · 2024: 9 · 2023: 8 · 2022: 16 · 2021: 9 · 2020: 5
- FWCI
- 8.88
- Type
- journal article
- Language
- en
- Open access
- closed
- Licence
- Locations
- IEEE Transactions on Software Engineering (publishedVersion)
- Funders
- Coordenação de Aperfeiçoamento de Pessoal de Nível Superior
- Conselho Nacional de Desenvolvimento Científico e Tecnológico
- Fundação Carlos Chagas Filho de Amparo à Pesquisa do Estado do Rio de Janeiro
- National Science Foundation (CCF-1414197)
- 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 › Computer Science Applications › Open Source Software Innovations
- Keywords
- merge conflicts, conflict resolution strategies, open-source Java projects, GitHub
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: On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub. https://app.cochat.ai/papers/10.1109/tse.2018.2871083
- The paper
- Ghiotto, G., Murta, L., Barros, M., & van der Hoek, A. (2020). On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub. IEEE Transactions on Software Engineering. https://doi.org/10.1109/tse.2018.2871083
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.