CoChat

Software Practitioner Perspectives on Merge Conflicts and Resolutions

McKee, Shane, Nelson, Nicholas, Sarma, Anita, Dig, Danny · 2017 · 2017 IEEE International Conference on Software Maintenance and Evolution (ICSME)
Cited by 53

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.

A few free checks a day · papers already verified open instantly · results are public

Integrity signals

Registry

Crossref · 10.1109/icsme.2017.53

Cites

10 of 10 references verified0 citation errors · 0 not checkable

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.

A few free checks a day · papers already verified open instantly · results are public

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

Research works printed but not linked: 51

  1. 10.1145/1368088.1368122 · DOI · Paper page
  2. garmus, 2001, Function Point Analysis Measurement Practices for Successful Software Projects
  3. 10.1109/32.879815 · DOI · Paper page
  4. ritchie, 2013, Qualitative research practice A guide for social science students and researchers Sage
  5. 10.1109/ICSM.2015.7332446 · DOI
  6. 10.1145/2950290.2950339 · DOI
  7. 10.1145/2675133.2675177 · DOI
  8. 10.1109/32.4618 · DOI
  9. 10.1109/ICSE.2015.55 · DOI · Paper page
  10. 10.1145/2884781.2884826 · DOI · Paper page
  11. hudson, 2013, Card sorting, Encyclopedia of Human-Computer Interaction The Interaction Design Foundation
  12. spencer, 2009, Card Sorting Designing Usable Categories
  13. 10.1016/j.iheduc.2005.11.001 · DOI · Paper page
  14. 10.1109/ICSE.2013.6606619 · DOI · Paper page
  15. 10.1145/1810295.1810339 · DOI · Paper page
  16. 10.1007/978-1-84800-044-5 · DOI · Paper page
  17. 10.1145/2393596.2393656 · DOI · Paper page
  18. 10.1007/978-1-84800-044-5_2 · DOI
  19. 0, Companion site
  20. 10.1177/0049124113500475 · DOI · Paper page
  21. 10.1145/1281700.1281702 · doi:10.1145/1281700.1281702
  22. guilford, 1954, Psychometric Methods
  23. 10.1145/1985441.1985469 · DOI
  24. 10.1109/VLHCC.2016.7739675 · DOI
  25. 10.1145/1984642.1984645 · DOI
  26. 10.1145/2568225.2568322 · DOI · Paper page
  27. 10.1109/SANER.2015.7081851 · DOI
  28. 10.1109/CMV.2003.1215003 · DOI
  29. 10.1109/HCC.2002.1046337 · DOI
  30. 10.1109/SANER.2016.46 · DOI
  31. 10.1109/TSE.2002.1000449 · DOI · Paper page
  32. 10.1109/ICSME.2014.63 · DOI
  33. 10.1109/ICSE.2007.71 · doi:10.1109/icse.2007.71
  34. 10.1109/ICSM.2002.1167812 · DOI
  35. 10.1145/1368088.1368092 · DOI · Paper page
  36. 10.1145/1134285.1134355 · DOI · Paper page
  37. 10.1145/2393596.2393648 · DOI · Paper page
  38. 10.1145/2025113.2025139 · DOI · Paper page
  39. 10.1145/958160.958177 · DOI · Paper page
  40. 10.1109/ICGSE.2014.17 · DOI
  41. sarma, 2008, Palantir Enhancing Configuration Management Systems with Workspace Awareness to Detect and Resolve Emerging Conflicts
  42. 10.1109/ICSME.2014.76 · DOI
  43. 10.1109/ICSE.2012.6227180 · DOI · Paper page
  44. weinberg, 1992, Systems Thinking, Quality Software Management, 1
  45. 10.1037/0096-3445.129.3.308 · doi:10.1037/0096-3445.129.3.308 · Paper page
  46. 10.1145/2901739.2901740 · DOI
  47. sun, 2015, What Information in Software Historical Repositories Do We Need to Support Software Maintenance Tasks? An Approach Based on Topic Model, 27
  48. 10.1109/SCAM.2014.14 · DOI · Paper page
  49. hindle, 2009, Automatic classification of large changes into maintenance categories, International Conference on Program Comprehension (ICPC), 30
  50. 10.1007/s004269900004 · DOI · Paper page
  51. 10.1109/ASEW.2008.4686322 · DOI

Cited by

See all 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

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.