一句话：调查开发者解决合并冲突的过程与工具，并探讨改进方向，以减轻协作中断。
大多数软件开发以团队协作方式进行，多名开发者同时修改源代码时可能产生变更冲突，迫使开发者中断当前工作流来处理合并冲突。这种中断会带来挫败感并降低生产力，因此协作及其相关问题成为软件开发的重要方面，而合并冲突是团队协作中较难处理的问题之一。该研究围绕开发者如何解决合并冲突展开调查，关注解决过程、所用工具以及可能的改进方向。摘要未给出具体的研究设计、样本或评估结果，但表明其目标是为理解并改善合并冲突处理实践提供依据。
Most software development is done in teams. When more than one developer is modifying the source code, there is a change that their changes will conflict. When this happens, developers have to interrupt their workflow in order to resolve the merge conflict. This interruption can lead to frustration and lost productivity. This makes collaboration, and the problems associated with it, an important aspect of software development. Merge conflicts are some of the more difficult issues that arise when working in a team.
DOI 原文 ·
@inproceedings{paperbot4686,
title = {How do developers resolve merge conflicts? an investigation into the processes, tools, and improvements},
author = {Caius Brindescu},
booktitle = {FSE},
year = {2018},
doi = {10.1145/3236024.3275430}
}