Causes of merge conflicts: a case study of ElasticSearch
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
Cites
Statistics
Verification
Claims the paper makes
Citations
Cites
Feature-Oriented Software Product Lines: Concepts and Implementation
Apel, S., Batory, D., Kästner, C., & Saake, G. (2013) · Springer eBooks · doi:10.1007/978-3-642-37521-7 · Cited by 790
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
A survey of variability modeling in industrial practice
Berger, T., Rublack, R., Nair, D., Atlee, J. M., Becker, M., Czarnecki, K., & Wąsowski, A. (2013) · Proceedings of the Seventh International Workshop on Variability Modelling of Software-intensive Systems · doi:10.1145/2430502.2430513 · Cited by 404
Self-citationWork practices and challenges in pull-based development: the contributor's perspective
Gousios, G., Storey, M.-A., & Bacchelli, A. (2016) · Proceedings of the 38th International Conference on Software Engineering · doi:10.1145/2884781.2884826 · Cited by 335
Work Practices and Challenges in Pull-Based Development: The Integrator's Perspective
Gousios, G., Zaidman, A., Storey, M.-A., & Deursen, A. V. (2015) · 2015 IEEE/ACM 37th IEEE International Conference on Software Engineering · doi:10.1109/icse.2015.55 · Cited by 312
An Exploratory Study of Cloning in Industrial Software Product Lines
Dubinsky, Y., Rubin, J., Berger, T., Duszynski, S., Becker, M., & Czarnecki, K. (2013) · 2013 17th European Conference on Software Maintenance and Reengineering · doi:10.1109/csmr.2013.13 · Cited by 260
Self-citationProactive 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
Reengineering legacy applications into software product lines: a systematic mapping
Assunção, W. K. G., Lopez-Herrejon, R. E., Linsbauer, L., Vergílio, S. R., & Egyed, A. F. (2017) · Empirical Software Engineering · doi:10.1007/s10664-017-9499-z · Cited by 154
Semistructured merge: rethinking merge in revision control systems
Apel, S., Liebig, J., Brandl, B., Lengauer, C., & Kästner, C. (2011) · Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering · doi:10.1145/2025113.2025141 · Cited by 113
Palantir: Early Detection of Development Conflicts Arising from Parallel Code Changes
Sarma, A., Redmiles, D. F., & van der Hoek, A. (2012) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2011.64 · Cited by 105
The state of adoption and the challenges of systematic variability management in industry
Berger, T., Steghöfer, J.-P., Ziadi, T., Robin, J., & Martinez, J. (2020) · Empirical Software Engineering · doi:10.1007/s10664-019-09787-6 · Cited by 96
Self-citationForked and integrated variants in an open-source firmware project
Stănciulescu, Ș., Schulze, S., & Wąsowski, A. (2015) · IEEE International Conference on Software Maintenance (ICSM) · doi:10.1109/icsm.2015.7332461 · Cited by 95
Improving early detection of software merge conflicts
Guimarães, M. L., & Silva, A. R. (2012) · doi:10.5555/2337223.2337264 · Cited by 83
Cassandra: Proactive conflict minimization through optimized task scheduling
Kasi, B. K., & Sarma, A. (2013) · 2013 35th International Conference on Software Engineering (ICSE) · doi:10.1109/icse.2013.6606619 · Cited by 81
A framework for managing cloned product variants
Rubin, J., & Chećhik, M. (2013) · ACM/IEEE International Conference on Software Engineering: Companion Proceedings (ICSE-Companion) · doi:10.1109/icse.2013.6606686 · Cited by 76
Evaluating and improving semistructured merge
Cavalcanti, G., Borba, P., & Accioly, P. (2017) · Proceedings of the ACM on Programming Languages · doi:10.1145/3133883 · Cited by 67
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 · cited 1×
“[21] analyze merge conflicts in 2,731 open-source Java projects.”
BackgroundMaintaining feature traceability with embedded annotations
Ji, W., Berger, T., Antkiewicz, M., & Czarnecki, K. (2015) · Proceedings of the 19th International Conference on Software Product Line · doi:10.1145/2791060.2791107 · Cited by 66
Self-citationA framework for managing cloned product variants
Rubin, J., & Chećhik, M. (2013) · doi:10.5555/2486788.2486971 · Cited by 58
Improving early detection of software merge conflicts
Guimarães, M. L., & Silva, A. R. (2012) · 2012 34th International Conference on Software Engineering (ICSE) · doi:10.1109/icse.2012.6227180 · Cited by 56
Software Practitioner Perspectives on Merge Conflicts and Resolutions
McKee, S., Nelson, N., Sarma, A., & Dig, D. (2017) · 2017 IEEE International Conference on Software Maintenance and Evolution (ICSME) · doi:10.1109/icsme.2017.53 · Cited by 53
Experiences Adopting Software Product Line Development without a Product Line Architecture
Staples, M., & Hill, D. (2005) · Asia-Pacific Software Engineering Conference (APSEC) · doi:10.1109/apsec.2004.50 · Cited by 49
Cassandra: proactive conflict minimization through optimized task scheduling
Kasi, B. K., & Sarma, A. (2013) · Lincoln (University of Nebraska) · doi:10.5555/2486788.2486884 · Cited by 48
Understanding 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
Semi-Automated Feature Traceability with Embedded Annotations
Abukwaik, H., Burger, A., Andam, B. K., & Berger, T. (2018) · IEEE International Conference on Software Maintenance (ICSM) · doi:10.1109/icsme.2018.00049 · Cited by 47
Self-citationFLOrIDA: Feature LOcatIon DAshboard for extracting and visualizing feature traces
Andam, B. K., Burger, A., Berger, T., & Chaudron, M. R. V. (2017) · International Workshop on Variability Modelling of Software-Intensive Systems (VaMoS) · doi:10.1145/3023956.3023967 · Cited by 44
Self-citationFacing the Truth: Benchmarking the Techniques for the Evolution of Variant-Rich Systems
Strüber, D., Mukelabai, M., Krüger, J., Fischer, S., Linsbauer, L., Martinez, J., & Berger, T. (2019) · International Software Product Line Conference (SPLC) · doi:10.1145/3336294.3336302 · Cited by 44
Self-citationCloned product variants: from ad-hoc to managed software product lines
Rubin, J., Czarnecki, K., & Chećhik, M. (2015) · International Journal on Software Tools for Technology Transfer · doi:10.1007/s10009-014-0347-9 · Cited by 38
Clone-Based Variability Management in the Android Ecosystem
Businge, J., Openja, M., Nadi, S., Bainomugisha, E., & Berger, T. (2018) · 2018 IEEE International Conference on Software Maintenance and Evolution (ICSME) · doi:10.1109/icsme.2018.00072 · Cited by 38
Self-citationActivities and costs of re-engineering cloned variants into an integrated platform
Krüger, J., & Berger, T. (2020) · International Workshop on Variability Modelling of Software-Intensive Systems (VaMoS) · doi:10.1145/3377024.3377044 · Cited by 34
Self-citationTuning GitHub for SPL development
Montalvillo, L., & Díaz, Ó. (2015) · International Software Product Line Conference (SPLC) · doi:10.1145/2791060.2791083 · Cited by 31
Variability Modeling of Service Robots: Experiences and Challenges
García, S., Strüber, D., Brugali, D., Fava, A. D., Schillinger, P., Pelliccione, P., & Berger, T. (2019) · International Workshop on Variability Modelling of Software-Intensive Systems (VaMoS) · doi:10.1145/3302333.3302350 · Cited by 28
Self-citationSoftware process recovery using Recovered Unified Process Views
Hindle, A., Godfrey, M. W., & Holt, R. C. (2010) · IEEE International Conference on Software Maintenance (ICSM) · doi:10.1109/icsm.2010.5609670 · Cited by 21
Intention-Based Integration of Software Variants
Lillack, M., Stănciulescu, Ș., Hedman, W., Berger, T., & Wąsowski, A. (2019) · ACM/IEEE International Conference on Software Engineering: Companion Proceedings (ICSE-Companion) · doi:10.1109/icse.2019.00090 · Cited by 20
Self-citationVisualization of Feature Locations with the Tool FeatureDashboard
Entekhabi, S., Solback, A., Steghöfer, J.-P., & Berger, T. (2019) · International Software Product Line Conference (SPLC) · doi:10.1145/3307630.3342392 · Cited by 20
Self-citationReducing coordination overhead in SPLs: peering in on peers
Montalvillo, L., Díaz, Ó., & Fogdal, T. (2018) · International Software Product Line Conference (SPLC) · doi:10.1145/3233027.3233041 · Cited by 9
Software Process Recovery: Recovering Process from Artifacts
Hindle, A. (2010) · Working Conference on Reverse Engineering (WCRE) · doi:10.1109/wcre.2010.46 · Cited by 7
Refactoring-aware version control
Freese, T. (2006) · ACM/IEEE International Conference on Software Engineering: Companion Proceedings (ICSE-Companion) · doi:10.1145/1134285.1134461 · Cited by 6
Research works printed but not linked: 3
- 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.
- 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).
- Ş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
Reuse and maintenance practices among divergent forks in three software ecosystems
Businge, J., Openja, M., Nadi, S., & Berger, T. (2022) · Empirical Software Engineering · doi:10.1007/s10664-021-10078-2 · Cited by 37
Self-citationDetecting Semantic Conflicts via Automated Behavior Change Detection
Silva, L. D., Borba, P. H. M., Mahmood, W., Berger, T., & Moisakis, J. (2020) · IEEE International Conference on Software Maintenance (ICSM) · doi:10.1109/icsme46990.2020.00026 · Cited by 34
Self-citationChallenges of Resolving Merge Conflicts: A Mining and Survey Study
Vale, G., Hunsen, C., Figueiredo, E., & Apel, S. (2021) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2021.3130098 · Cited by 38
Virtual Platform: Effective and Seamless Variability Management for Software Systems
Mahmood, W., Çalıklı, G., Strüber, D., Lämmel, R., Mukelabai, M., & Berger, T. (2024) · IEEE Transactions on Software Engineering · doi:10.1109/tse.2024.3406224 · Cited by 7
Self-citationTowards developer support for merging forked test cases
Schulze, S., Krüger, J., & Wünsche, J. (2022) · International Software Product Line Conference (SPLC) · doi:10.1145/3546932.3547002 · Cited by 4
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
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.