Journal Article

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

Fulltext URI

Document type

Text/Journal Article

Additional Information



Journal Title

Journal ISSN

Volume Title


Springer, London


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.


Nguyen, Hoai-Le; Ignat, Claudia-Lavinia (2018): An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects. Computer Supported Cooperative Work 27(3-4)- ECSCW 2018: Proceedings of the 16th European Conference on Computer Supported Cooperative Work. DOI: 10.1007/s10606-018-9323-3. Springer, London. PISSN: ISSN 0925-9724. Long Papers. Nancy, France. 4-8 June 2018