Parallelism and conflicting changes in Git version control systems

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 ooers some very interesting features, resolving collaborative connicts that arise during synchronization of parallel changes is a time-consuming task. In this paper we present an analysis of concurrency and connicts in oocial Git repository of four projects: Rails, IkiWiki, Samba and Linux Kernel. We also analyze how ooen users decide to rollback to previous document version when the integration process results in connict. Finally, we discuss the mechanism adopted by Git to consider changes made on two continuous lines as conflicting.
Type de document :
Communication dans un congrès
IWCES’17 - The Fifteenth International Workshop on Collaborative Editing Systems , Feb 2017, Portland, Oregon, United States. 2017
Liste complète des métadonnées

Littérature citée [11 références]  Voir  Masquer  Télécharger

https://hal.inria.fr/hal-01588482
Contributeur : Hoai Le Nguyen <>
Soumis le : samedi 16 septembre 2017 - 14:47:41
Dernière modification le : jeudi 11 janvier 2018 - 06:27:29
Document(s) archivé(s) le : dimanche 17 décembre 2017 - 12:40:15

Fichier

iwces15_Parallelism-and-confli...
Fichiers produits par l'(les) auteur(s)

Identifiants

  • HAL Id : hal-01588482, version 1

Citation

Hoai Le Nguyen, Claudia-Lavinia Ignat. Parallelism and conflicting changes in Git version control systems. IWCES’17 - The Fifteenth International Workshop on Collaborative Editing Systems , Feb 2017, Portland, Oregon, United States. 2017. 〈hal-01588482〉

Partager

Métriques

Consultations de la notice

235

Téléchargements de fichiers

76