An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects

Hoai Le Nguyen 1 Claudia-Lavinia Ignat 1
1 COAST - Web Scale Trustworthy Collaborative Service Systems
Inria Nancy - Grand Est, LORIA - NSS - Department of Networks, Systems and Services
Abstract : Version control systems such as Git support parallel collaborative work and became very widespread in the open-source community. While Git offers some very interesting features, resolving conflicts that arise during synchronization of parallel changes is a time-consuming task. In this paper we present an analysis of concurrency and conflicts in official Git repository of four projects: Rails, IkiWiki, Samba and Linux Kernel. We analyse the collaboration process of these projects at specific periods revealing how change integration and conflict rates vary during project development life-cycle. We also analyse how often users decide to rollback to previous document version when the integration process generates conflicts. Finally, we discuss the mechanism adopted by Git to consider changes made on two continuous lines as conflicting.
Document type :
Journal articles
Liste complète des métadonnées

https://hal.archives-ouvertes.fr/hal-01917249
Contributor : Claudia-Lavinia Ignat <>
Submitted on : Friday, November 9, 2018 - 11:39:13 AM
Last modification on : Tuesday, December 18, 2018 - 4:26:02 PM
Document(s) archivé(s) le : Sunday, February 10, 2019 - 12:55:26 PM

File

ecscw2018.pdf
Files produced by the author(s)

Identifiers

Collections

Citation

Hoai Le Nguyen, Claudia-Lavinia Ignat. An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects. Computer Supported Cooperative Work, Springer Verlag, 2018, 27 (3-6), pp.741-765. ⟨10.1007/s10606-018-9323-3⟩. ⟨hal-01917249⟩

Share

Metrics

Record views

61

Files downloads

57