W Aldndni, F Servant, N Meng - 2024 IEEE/ACM 32nd International …, 2024 - computer.org
Developers regularly have to resolve merge conflicts, ie, two conflicting sets of changes to
the same files in different branches, which can be tedious and error-prone. To resolve …