Understanding the Impact of Branch Edit Features for the Automatic Prediction of Merge Conflict Resolutions
Waad Aldndni, Francisco Servant, Na Meng · 2024
Developers regularly have to resolve merge conflicts, i.e., two conflicting sets of changes to the same files in different branches, which can be tedious and error-prone. To resolve conflicts, developers typically: keep the local version (KL) or the remote version (KR) of the code. They also sometimes manually edit both versions into a single one (ME). However, most existing techniques only support merging the local and remote versions (the ME strategy).