Parallelism and conflicting changes in Git version control systems - Archive ouverte HAL Access content directly
Conference Papers Year : 2017

Parallelism and conflicting changes in Git version control systems

(1) , (1)
1

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.
Fichier principal
Vignette du fichier
iwces15_Parallelism-and-conflicting-changes-in-Git.pdf (418.13 Ko) Télécharger le fichier
Origin : Files produced by the author(s)
Loading...

Dates and versions

hal-01588482 , version 1 (16-09-2017)

Identifiers

  • HAL Id : hal-01588482 , version 1

Cite

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. ⟨hal-01588482⟩
342 View
261 Download

Share

Gmail Facebook Twitter LinkedIn More