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

Simple item page
dc.contributor.authorNguyen, Hoai Le
dc.contributor.authorIgnat, Claudia-Lavinia
dc.date.accessioned2020-06-06T13:06:15Z
dc.date.available2020-06-06T13:06:15Z
dc.date.issued43435
dc.description.abstractVersion 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.de
dc.identifier.doi10.1007/s10606-018-9323-3
dc.identifier.pissn1573-7551
dc.identifier.urihttp://dx.doi.org/10.1007/s10606-018-9323-3
dc.identifier.urihttps://dl.eusset.eu/handle/20.500.12015/3776
dc.publisherSpringer
dc.relation.ispartofComputer Supported Cooperative Work (CSCW): Vol. 27, No. 3-6
dc.relation.ispartofseriesComputer Supported Cooperative Work (CSCW)
dc.subjectConflicts
dc.subjectParallel work
dc.subjectVersion control systems
dc.titleAn Analysis of Merge Conflicts and Resolutions in Git-Based Open Source Projectsde
dc.typeText/Journal Article
gi.citation.endPage765
gi.citation.startPage741

Files

Collections

JCSCW Vol. 27 (2018)