On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub
@article{Ghiotto2020OnTN,
title={On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub},
author={Gleiph Ghiotto and L. Murta and M. Barros and Andr{\'e} van der Hoek},
journal={IEEE Transactions on Software Engineering},
year={2020},
volume={46},
pages={892-915}
}When multiple developers change a software system in parallel, these concurrent changes need to be merged to all appear in the software being developed. [...] Key Result Our results give rise to three primary recommendations for future merge techniques, that - when implemented - could on one hand help in automatically resolving certain types of conflicts and on the other hand provide the developer with tool-based assistance to more easily resolve other types of conflicts that cannot be automatically resolved.Expand Abstract
Figures, Tables, and Topics from this paper.
16 Citations
Understanding Merge Conflicts and Resolutions in Git Rebases
- Computer Science
- 2020 IEEE 31st International Symposium on Software Reliability Engineering (ISSRE)
- 2020
IntelliMerge: a refactoring-aware software merging technique
- Computer Science
- Proc. ACM Program. Lang.
- 2019
- 5
The Impact of Structure on Software Merging: Semistructured Versus Structured Merge
- Computer Science
- 2019 34th IEEE/ACM International Conference on Automated Software Engineering (ASE)
- 2019
- 3
- PDF
Predicting Merge Conflicts in Collaborative Software Development
- Computer Science
- 2019 ACM/IEEE International Symposium on Empirical Software Engineering and Measurement (ESEM)
- 2019
- 2
- PDF
Planning for untangling: predicting the difficulty of merge conflicts
- Computer Science
- ICSE
- 2020
- 1
- Highly Influenced
- PDF
On the relation between Github communication activity and merge conflicts
- Computer Science
- Empirical Software Engineering
- 2019
- 2
- Highly Influenced
- PDF
References
SHOWING 1-10 OF 43 REFERENCES
Understanding semi-structured merge conflict characteristics in open-source Java projects
- Computer Science
- Empirical Software Engineering
- 2017
- 24
- PDF
Proactive detection of collaboration conflicts
- Computer Science
- ESEC/FSE '11
- 2011
- 177
- Highly Influential
- PDF
An Empirical Examination of the Relationship between Code Smells and Merge Conflicts
- Computer Science
- 2017 ACM/IEEE International Symposium on Empirical Software Engineering and Measurement (ESEM)
- 2017
- 27
- PDF
Indicators for merge conflicts in the wild: survey and empirical study
- Computer Science
- Automated Software Engineering
- 2017
- 16
- PDF
How we resolve conflict: an empirical study of method-level conflict resolution
- Computer Science
- 2015 IEEE 1st International Workshop on Software Analytics (SWAN)
- 2015
- 7
- PDF
Improving early detection of software merge conflicts
- Computer Science
- 2012 34th International Conference on Software Engineering (ICSE)
- 2012
- 89
- PDF
Safe-commit analysis to facilitate team software development
- Computer Science
- 2009 IEEE 31st International Conference on Software Engineering
- 2009
- 52
- PDF
Software Practitioner Perspectives on Merge Conflicts and Resolutions
- Computer Science
- 2017 IEEE International Conference on Software Maintenance and Evolution (ICSME)
- 2017
- 23
- PDF
Semistructured merge: rethinking merge in revision control systems
- Computer Science
- ESEC/FSE '11
- 2011
- 75
- PDF