Can Pre-trained Language Models be Used to Resolve Textual and Semantic Merge Conflicts?

Jialu Zhang, Todd Mytkowicz, Mike Kaufman +2

Program merging is standard practice when developers integrate their individual changes to a common code base. When the merge algorithm fails, this is called a merge conflict. The…