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.

中文翻译：

---

基于Git的开源项目中的合并冲突和解决方案分析

版本控制系统（例如Git）支持并行协作工作，并在开源社区中非常普遍。尽管Git提供了一些非常有趣的功能，但是解决并行更改同步期间出现的冲突是一项耗时的任务。在本文中，我们对四个项目的官方Git存储库中的并发和冲突进行了分析：Rails，IkiWiki，Samba和Linux Kernel。我们分析了这些项目在特定时期的协作过程，揭示了在项目开发生命周期中变更整合和冲突率如何变化。我们还分析了在集成过程中产生冲突时用户决定回滚到先前文档版本的频率。最后，我们讨论了Git所采用的将两条连续线上所做的更改视为冲突的机制。