Microsoft Corporation
AUTOMATED MERGE CONFLICT RESOLUTION

Abstract:

An automated system for resolving program merges uses a sequence-to-sequence supervised machine learning model trained from developer-resolved merge conflicts to learn to predict a merge resolution to resolve a three-way program merge. The model utilizes an embedding of the merge tuple (A, B, O) which represents the program syntax, program semantics and the intent of the program inputs. The model uses a pointer mechanism to construct the resolved program in terms of the lines of source code found in the input programs.