Improving early detection of software merge conflicts
The DOI matches its Crossref record; 1 of the 1 references it cites were found in a registry or an index.
Abstract
Merge conflicts cause software defects which if detected late may require expensive resolution. This is especially true when developers work too long without integrating concurrent changes, which in practice is common as integration generally occurs at check-in. Awareness of others' activities was proposed to help developers detect conflicts earlier. However, it requires developers to detect conflicts by themselves and may overload them with notifications, thus making detection harder. This paper presents a novel solution that continuously merges uncommitted and committed changes to create a background system that is analyzed, compiled, and tested to precisely and accurately detect conflicts on behalf of developers, before check-in. An empirical study confirms that our solution avoids overloading developers and improves early detection of conflicts over existing approaches. Similarly to what happened with continuous compilation, this introduces the case for continuous merging inside the IDE.
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
Awareness and coordination in shared workspaces
Dourish, P., & Bellotti, V. (1992) · Proceedings of the 1992 ACM conference on Computer-supported cooperative work - CSCW '92 · doi:10.1145/143457.143468 · Cited by 2,550
Research works printed but not linked: 22
- Berczuk, 2002, Software Configuration Management Patterns: Effective Teamwork, Practical Integration
- Fowler, Continuous Integration
- 10.1145/383876.383878 · DOI · Paper page
- 10.1145/2025113.2025139 · DOI · Paper page
- Duvall, 2007, Continuous Integration: Improving Software Quality and Reducing Risk
- 10.1145/224019.224036 · DOI
- 10.1145/958160.958177 · DOI · Paper page
- 10.1109/ICGSE.2007.13 · DOI · Paper page
- 10.1145/289444.289502 · DOI · Paper page
- 10.1145/1984642.1984662 · DOI
- 10.1145/1833310.1833320 · DOI
- 10.1007/0-306-48019-0_5 · DOI
- 10.1007/978-1-84800-031-5_9 · DOI
- 10.1145/1321631.1321647 · DOI
- 10.1145/1240624.1240823 · DOI · Paper page
- 10.1145/192844.193016 · DOI
- 10.1023/A:1026586415054 · DOI · Paper page
- 10.1145/1180875.1180884 · DOI
- 10.1145/1031607.1031611 · doi:10.1145/1031607.1031611
- 10.1145/1454247.1454255 · DOI
- 10.1145/1806799.1806867 · DOI
- 10.1145/1453101.1453118 · DOI
Cited by
Early Detection of Collaboration Conflicts and Risks
Brun, Y., Holmes, R., Ernst, M. D., & Notkin, D. (2013) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2013.28 · Cited by 82
“Performing this analysis continuously can help discover merge problems early [22].”
BackgroundOn 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
“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.”
BackgroundUnderstanding 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
“The ideal way to resolve a conflict is not always clear, and may require referring to project specification documentation or communicating with their peers about changes [6, 9, 13, 22, 33].”
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
Metadata
- Authors
- Guimarães, M. L., & Silva, A. R.
- Venue
- 2012 34th International Conference on Software Engineering (ICSE)
- Publisher
- IEEE
- Published
- 2012-06
- Pages
- 342-352
- ISSN
- 0270-5257 (ISSN-L)
- OpenAlex
- W3146893295
- Cited by
- 56
- References
- 1
- FWCI
- 2.78
- 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: Improving early detection of software merge conflicts. https://app.cochat.ai/papers/10.1109/icse.2012.6227180
- The paper
- Guimarães, M. L., & Silva, A. R. (2012). Improving early detection of software merge conflicts. 2012 34th International Conference on Software Engineering (ICSE). https://doi.org/10.1109/icse.2012.6227180
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.