Please use this identifier to cite or link to this item:
Title: An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects
Authors: Nguyen, Hoai-Le
Ignat, Claudia-Lavinia
Keywords: Version control systems;Parallel work;Conflicts
Issue Date: 2018
Publisher: Springer, London
metadata.dc.relation.ispartof: Computer Supported Cooperative Work 27(3-4)- ECSCW 2018: Proceedings of the 16th European Conference on Computer Supported Cooperative Work
Series/Report no.: ECSCW
Abstract: Version control systems such as Git support parallel collaborative work and became very widespread in the open-source community. Whilst Git offers some very interesting features, resolving conflicts that arise during synchronisation 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.
metadata.dc.identifier.doi: 10.1007/s10606-018-9323-3
ISSN: ISSN 0925-9724
metadata.mci.conference.sessiontitle: Long Papers
metadata.mci.conference.location: Nancy, France 4-8 June 2018
Appears in Collections:ECSCW 2018 Long Papers

Files in This Item:
File SizeFormat 
ecscw2018_nguyen.pdf850,46 kBAdobe PDFView/Open

Items in DSpace are protected by copyright, with all rights reserved, unless otherwise indicated.