Patent attributes
Some embodiments automatically assess source code merge conflict resolution candidates and then display a recommendation explaining strengths and weaknesses of each candidate. Thus informed, a developer can avoid adopting changes which produce merged code that does not build or does not pass tests, and avoid merged code that departs from a pattern followed in previous changes to a code base. Candidate conflict resolution assessments depend on objective criteria such as merged code buildability, operational accuracy, edit pattern consistency, or conflict resolution generator confidence. Candidates may be automatically ranked, prioritized, or rejected outright by an embodiment. Work item descriptions and candidate provenance may be displayed to aid developer selection of an optimal merge candidate.
