Understanding Predictive Factors for Merge Conflicts

Merge conflict factors and metrics

The following table summarizes the metrics according to each investigated factor category, with the metric name on the left, and its description on the right. Furthemore, the dependent variables are also described.

Study Design
Figure 1 - Merge conflict factors and metrics

[*] S. Chacon and B. Straub, Pro Git. Apress, 2014.
[**] Y. Zhao, A. Serebrenik, Y. Zhou, V. Filkov, and B. Vasilescu, “The impact of continuous integration on other software development practices: A large-scale empirical study,” in 2017 32nd IEEE/ACM International Conference on Automated Software Engineering (ASE). IEEE Press, 2017, pp. 60–71.