CoChat

Causes of merge conflicts: a case study of ElasticSearch

Mahmood, Wardah, Chagama, Moses, Berger, Thorsten, Hebig, Regina · 2020 · Proceedings of the 14th International Working Conference on Variability Modelling of Software-Intensive Systems

The DOI matches its Crossref record; 38 of the 38 references it cites were found in a registry or an index.

Abstract

Software branching and merging allows collaborative development and creating software variants, commonly referred to as clone & own. While simple and cheap, a trade-off is the need to merge code and to resolve merge conflicts, which frequently occur in practice. When resolving conflicts, a key challenge for developer is to understand the changes that led to the conflict. While merge conflicts and their characteristics are reasonably well understood, that is not the case for the actual changes that cause them.

Overview

Integrity signals

Registry

Crossref · 10.1145/3377024.3377047

Cites

38 of 38 references verified0 citation errors · 0 not checkable

Statistics

Recomputing p-values needs the paper’s full text.

Verification

Claims the paper makes

This paper’s full text isn’t openly available, so its claims and self-check weren’t run. The registry and citation checks still apply.

Citations

Cites

Show all 38 references

Research works printed but not linked: 3

  1. Sven Apel , Don Batory , Christian Kästner , and Gunter Saake . 2013. Feature-Oriented Software Product Lines . Springer . Sven Apel, Don Batory, Christian Kästner, and Gunter Saake. 2013. Feature-Oriented Software Product Lines. Springer.
  2. Anja Guzzi , Alberto Bacchelli , Yann Riche , and Arie van Deursen . 2015 . Supporting Developers' Coordination in the IDE (CSCW '15) . Anja Guzzi, Alberto Bacchelli, Yann Riche, and Arie van Deursen. 2015. Supporting Developers' Coordination in the IDE (CSCW '15).
  3. Ştefan Stănciulescu Sandro Schulze and Andrzej Wąsowski. 2015. Forked and integrated variants in an open-source firmware project. In ICSME. Ştefan Stănciulescu Sandro Schulze and Andrzej Wąsowski. 2015. Forked and integrated variants in an open-source firmware project. In ICSME. · DOI

Cited by

See all 14

Metadata

Authors
Mahmood, W., Chagama, M., Berger, T., & Hebig, R.
Affiliations
University of Gothenburg (SE)
Venue
Proceedings of the 14th International Working Conference on Variability Modelling of Software-Intensive Systems
Publisher
ACM
Published
2020-02-05
Pages
1-9
OpenAlex
W3004836869
Cited by
10
References
37
Citations by year
2025: 1 · 2024: 1 · 2023: 1 · 2022: 3 · 2021: 1 · 2020: 3
FWCI
1.52
Type
conference paper
Language
en
Open access
closed
Locations
  • International Workshop on Variability Modelling of Software-Intensive Systems (VaMoS) (publishedVersion)
  • Chalmers Research (Chalmers University of Technology) (submittedVersion)
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, code merging, conflict resolution, collaborative software development, software variants, clone-and-own

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: Causes of merge conflicts: a case study of ElasticSearch. https://app.cochat.ai/papers/10.1145/3377024.3377047
The paper
Mahmood, W., Chagama, M., Berger, T., & Hebig, R. (2020). Causes of merge conflicts: a case study of ElasticSearch. Proceedings of the 14th International Working Conference on Variability Modelling of Software-Intensive Systems. https://doi.org/10.1145/3377024.3377047

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.