US 11,853,746 B2
Source code merge conflict resolution
Peter Groenewegen, Sammamish, WA (US); and Mark Alistair Wilson-Thomas, Mercer Island, WA (US)
Assigned to Microsoft Technology Licensing, LLC, Redmond, WA (US)
Filed by Microsoft Technology Licensing, LLC, Redmond, WA (US)
Filed on Mar. 1, 2022, as Appl. No. 17/683,719.
Prior Publication US 2023/0281005 A1, Sep. 7, 2023
Int. Cl. G06F 8/70 (2018.01); G06F 11/36 (2006.01); G06F 8/41 (2018.01)
CPC G06F 8/70 (2013.01) [G06F 8/41 (2013.01); G06F 11/3688 (2013.01)] 20 Claims
OG exemplary drawing
 
1. A computing system which is configured to facilitate source code merge conflict resolution, comprising:
a digital memory;
a processor in operable communication with the digital memory, the processor configured to perform source code merge conflict resolution facilitation steps including: (a) obtaining from a merge conflict resolution generator at least two candidate merge conflict resolutions, the merge conflict resolution generator comprising program synthesis technology, a machine learning model, or other automation, (b) computationally assessing each candidate merge conflict resolution using a computational assessment mechanism and an assessment subset of a predefined set of assessment criteria, the predefined set comprising a buildability criterion, an accuracy criterion, and a consistency criterion, the assessment subset including at least the consistency criterion, (c) computationally ranking at least two candidate merge conflict resolutions relative to one another based on a computational result of the assessing, and (d) computationally displaying a recommendation based on the ranking;
wherein the candidate merge conflict resolutions are associated with a source code base, the computing system further comprises a pattern consistency assessment mechanism interface which is configured as an interface to a pattern consistency assessment mechanism, and wherein the assessing comprises:
submitting to the pattern consistency assessment mechanism interface a candidate merge conflict resolution and at least two committed changes to the source code base;
in response to the submitting, receiving from the pattern consistency assessment mechanism interface a consistency measure which indicates an extent of consistency of the submitted candidate merge conflict resolution with the committed changes; and
utilizing the consistency measure as a basis of the consistency criterion.