Software Practitioner Perspectives on Merge Conflicts and Resolutions
The DOI matches its Crossref record; 10 of the 10 references it cites were found in a registry or an index.
Abstract
Merge conflicts occur when software practitioners need to work in parallel and are inevitable in software development. Tool builders and researchers have focused on the prevention and resolution of merge conflicts, but there is little empirical knowledge about how practitioners actually approach and perform merge conflict resolution. Without such knowledge, tool builders might be building on wrong assumptions and researchers might miss opportunities for improving the state of the art.We conducted semi-structured interviews of 10 software practitioners across 7 organizations, including both open-source and commercial projects. We identify the key concepts and perceptions from practitioners, which we then validated via a survey of 162 additional practitioners.We find that practitioners are directly impacted by their perception of the complexity of the conflicting code, and may alter the timeline in which to resolve these conflicts, as well as the methods employed for conflict resolution based upon that initial perception. Practitioners' perceptions alter the impact of tools and processes that have been designed to preemptively and efficiently resolve merge conflicts. Understanding whether practitioners will react according to standard use cases is important when creating human-oriented tools to support development processes.
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
McCabe, T. J. (1976) · IEEE Transactions on Software Engineering · doi:10.1109/tse.1976.233837 · Cited by 6,059
Are We There Yet? Data Saturation in Qualitative Research
Fusch, P., & Ness, L. (2015) · The Qualitative Report · doi:10.46743/2160-3715/2015.2281 · Cited by 4,460
Goodman, L. A. (1961) · The Annals of Mathematical Statistics · doi:10.1214/aoms/1177705148 · Cited by 3,606
Selecting Empirical Methods for Software Engineering Research
Easterbrook, S., Singer, J., Storey, M.-A., & Damian, D. (2008) · Guide to Advanced Empirical Software Engineering · doi:10.1007/978-1-84800-044-5_11 · Cited by 1,167 · cited 1×
“[18].”
A diary study of task switching and interruptions
Czerwinski, M., Horvitz, E., & Wilhite, S. (2004) · Proceedings of the SIGCHI Conference on Human Factors in Computing Systems · doi:10.1145/985692.985715 · Cited by 830
Information Needs in Collocated Software Development Teams
Ko, A. J., DeLine, R., & Venolia, G. (2007) · 29th International Conference on Software Engineering (ICSE'07) · doi:10.1109/icse.2007.45 · Cited by 499 · cited 1×
“To answer the above key questions, we talked directly to practitioners, which is crucial to understanding problems in context [14]–[17].”
BackgroundQuestions programmers ask during software evolution tasks
Sillito, J., Murphy, G. C., & De Volder, K. (2006) · Proceedings of the 14th ACM SIGSOFT international symposium on Foundations of software engineering · doi:10.1145/1181775.1181779 · Cited by 270
The relevance of software documentation, tools and technologies: a survey
Forward, A., & Lethbridge, T. C. (2002) · Proceedings of the 2002 ACM symposium on Document engineering · doi:10.1145/585058.585065 · Cited by 268 · cited 1×
“[39] conducted a survey of 48 software practitioners and found that 68% either agreed or strongly agreed that documentation is always outdated.”
BackgroundUsing information fragments to answer the questions developers ask
Fritz, T., & Murphy, G. C. (2010) · Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 1 · doi:10.1145/1806799.1806828 · Cited by 163
Communication networks in geographically distributed software development
Cataldo, M., & Herbsleb, J. D. (2008) · Proceedings of the 2008 ACM conference on Computer supported cooperative work · doi:10.1145/1460563.1460654 · Cited by 98 · cited 1×
“sending out emails to the rest of the team, performing partial commits, or racing to finish changes [6][7].”
Background
Research works printed but not linked: 51
- 10.1145/1368088.1368122 · DOI · Paper page
- garmus, 2001, Function Point Analysis Measurement Practices for Successful Software Projects
- 10.1109/32.879815 · DOI · Paper page
- ritchie, 2013, Qualitative research practice A guide for social science students and researchers Sage
- 10.1109/ICSM.2015.7332446 · DOI
- 10.1145/2950290.2950339 · DOI
- 10.1145/2675133.2675177 · DOI
- 10.1109/32.4618 · DOI
- 10.1109/ICSE.2015.55 · DOI · Paper page
- 10.1145/2884781.2884826 · DOI · Paper page
- hudson, 2013, Card sorting, Encyclopedia of Human-Computer Interaction The Interaction Design Foundation
- spencer, 2009, Card Sorting Designing Usable Categories
- 10.1016/j.iheduc.2005.11.001 · DOI · Paper page
- 10.1109/ICSE.2013.6606619 · DOI · Paper page
- 10.1145/1810295.1810339 · DOI · Paper page
- 10.1007/978-1-84800-044-5 · DOI · Paper page
- 10.1145/2393596.2393656 · DOI · Paper page
- 10.1007/978-1-84800-044-5_2 · DOI
- 0, Companion site
- 10.1177/0049124113500475 · DOI · Paper page
- 10.1145/1281700.1281702 · doi:10.1145/1281700.1281702
- guilford, 1954, Psychometric Methods
- 10.1145/1985441.1985469 · DOI
- 10.1109/VLHCC.2016.7739675 · DOI
- 10.1145/1984642.1984645 · DOI
- 10.1145/2568225.2568322 · DOI · Paper page
- 10.1109/SANER.2015.7081851 · DOI
- 10.1109/CMV.2003.1215003 · DOI
- 10.1109/HCC.2002.1046337 · DOI
- 10.1109/SANER.2016.46 · DOI
- 10.1109/TSE.2002.1000449 · DOI · Paper page
- 10.1109/ICSME.2014.63 · DOI
- 10.1109/ICSE.2007.71 · doi:10.1109/icse.2007.71
- 10.1109/ICSM.2002.1167812 · DOI
- 10.1145/1368088.1368092 · DOI · Paper page
- 10.1145/1134285.1134355 · DOI · Paper page
- 10.1145/2393596.2393648 · DOI · Paper page
- 10.1145/2025113.2025139 · DOI · Paper page
- 10.1145/958160.958177 · DOI · Paper page
- 10.1109/ICGSE.2014.17 · DOI
- sarma, 2008, Palantir Enhancing Configuration Management Systems with Workspace Awareness to Detect and Resolve Emerging Conflicts
- 10.1109/ICSME.2014.76 · DOI
- 10.1109/ICSE.2012.6227180 · DOI · Paper page
- weinberg, 1992, Systems Thinking, Quality Software Management, 1
- 10.1037/0096-3445.129.3.308 · doi:10.1037/0096-3445.129.3.308 · Paper page
- 10.1145/2901739.2901740 · DOI
- sun, 2015, What Information in Software Historical Repositories Do We Need to Support Software Maintenance Tasks? An Approach Based on Topic Model, 27
- 10.1109/SCAM.2014.14 · DOI · Paper page
- hindle, 2009, Automatic classification of large changes into maintenance categories, International Conference on Program Comprehension (ICPC), 30
- 10.1007/s004269900004 · DOI · Paper page
- 10.1109/ASEW.2008.4686322 · DOI
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
“[43] first interviewed 10 developers and then performed a follow-on survey with 162 other developers to build a detailed understanding of developer perceptions regarding merge conflicts.”
BackgroundProgram 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
“McKee et al. [31] and Nelson et al. [33] interviewed developers and performed a follow-up survey with 162 developers to build a detailed understanding of developer perceptions regarding merge conflicts in general.”
MethodCauses 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
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
“Prior research has shown that merge conflicts introduce substantial coordination overhead and negatively impact developer productivity [7, 28, 36, 42, 53].”
Metadata
- Authors
- McKee, S., Nelson, N., Sarma, A., & Dig, D.
- Venue
- 2017 IEEE International Conference on Software Maintenance and Evolution (ICSME)
- Publisher
- IEEE
- Published
- 2017-09
- Pages
- 467-478
- OpenAlex
- W2767854151
- Cited by
- 53
- References
- 10
- FWCI
- 4.87
- 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: Software Practitioner Perspectives on Merge Conflicts and Resolutions. https://app.cochat.ai/papers/10.1109/icsme.2017.53
- The paper
- McKee, S., Nelson, N., Sarma, A., & Dig, D. (2017). Software Practitioner Perspectives on Merge Conflicts and Resolutions. 2017 IEEE International Conference on Software Maintenance and Evolution (ICSME). https://doi.org/10.1109/icsme.2017.53
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.