How code composition strategies affect merge conflict resolution?
Journal of Software Engineering Research and Development · 31.10.2024 · 12 (1)
DOI: 10.5753/jserd.2024.3638 ↗Kurz gefasst
Fachartikel in der Zeitschrift Journal of Software Engineering Research and Development, online erschienen am 31.10.2024. Verfasst von Heleno de S. Campos Junior und 4 weiteren Autor:innen. Die Arbeit wurde bisher 2-mal zitiert (Crossref) und nennt 28 Literaturangaben. Der Volltext ist frei zugänglich (Open Access, CC BY 4.0).
Abstract (Originalsprache)
Software developers often need to combine their contributions. This operation is called merge. When the contributions happen at the same physical region in the source code, the merge is marked as conflicting and must be manually resolved by the developers. Existing studies explore why conflicts happen, their characteristics, and how they are resolved. This paper investigates a subset of merge conflicts, which may be resolved using a combination of existing lines. We analyze 10,177 conflict chunks of popular projects that were resolved by combining existing lines, aiming at characterizing and finding patterns frequently addressed by developers to resolve them. We found that these conflicting chunks and their resolutions are usually small (they have a median of 6 LOC and 3 LOC, respectively). Moreover, 98.6% of the analyzed resolutions preserve the order of the lines in the conflicting chunks. We also found that 72.7% of the chunk resolutions do not interleave lines from different contributions more than once. Finally, developers prefer to resolve conflicts containing only Import statements using lines from the local version of the conflict. When used as heuristics for automatic merge resolution, these findings could reduce the search space by 94.7%, paving the road for future search-based software engineering tools for this problem.
Zitieren
APA
Junior, H. D. S. C., Menezes, G. G. L. D., Barros, M. D. O., Hoek, A. V. D., & Murta, L. G. P. (2024). How code composition strategies affect merge conflict resolution?. Journal of Software Engineering Research and Development, 12(1). https://doi.org/10.5753/jserd.2024.3638
Vancouver
Junior HDSC, Menezes GGLD, Barros MDO, Hoek AVD, Murta LGP. How code composition strategies affect merge conflict resolution?. Journal of Software Engineering Research and Development. 2024;12(1). doi:10.5753/jserd.2024.3638
BibTeX
@article{Junior2024,
author = {Junior, Heleno de S. Campos and Menezes, Gleiph Ghiotto L. de and Barros, Márcio de Oliveira and Hoek, André van der and Murta, Leonardo Gresta Paulino},
title = {How code composition strategies affect merge conflict resolution?},
journal = {Journal of Software Engineering Research and Development},
year = {2024},
volume = {12},
number = {1},
doi = {10.5753/jserd.2024.3638}
}
EUVIMED