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.
Complete list of metadatas

Cited literature [11 references]  Display  Hide  Download

https://hal.inria.fr/hal-01588482
Contributor : Hoai Le Nguyen <>
Submitted on : Saturday, September 16, 2017 - 2:47:41 PM
Last modification on : Tuesday, December 18, 2018 - 4:26:02 PM
Long-term archiving on : Sunday, December 17, 2017 - 12:40:15 PM

File

iwces15_Parallelism-and-confli...
Files produced by the author(s)

Identifiers

  • 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. ⟨hal-01588482⟩

Share

Metrics

Record views

396

Files downloads

93