RESOLVING MERGE CONFLICTS THAT PREVENT BLOCKS OF PROGRAM CODE FROM PROPERLY BEING MERGED

摘要

This disclosure relates to resolving merge conflicts that prevent blocks of program code from properly being merged. A merge conflict that prevents blocks of program code from properly being merged can be identified. Responsive to identifying the merge conflict, a pattern of a respective portion of at least one of the blocks of program code can be identified, and a determination can be made as to whether the pattern matches an existing merge rule. Responsive to determining that the pattern matches the existing merge rule, the existing merge rule can be validated against a syntax of the portion of at least one of the blocks of program code. Responsive to the existing merge rule successfully validating against the syntax of the portion of at least one of the blocks of program code, the existing merge rule can be applied to resolve the merge conflict.