An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects - Inria - Institut national de recherche en sciences et technologies du numérique Accéder directement au contenu
Article Dans Une Revue Computer Supported Cooperative Work Année : 2018

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

Résumé

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.
Fichier principal
Vignette du fichier
ecscw2018.pdf (850.46 Ko) Télécharger le fichier
Origine : Fichiers produits par l'(les) auteur(s)
Loading...

Dates et versions

hal-01917249 , version 1 (09-11-2018)

Identifiants

Citer

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

Altmetric

Partager

Gmail Facebook X LinkedIn More