ALEXANDRIA, Va., Jan. 13 -- United States Patent no. 12,524,647, issued on Jan. 13, was assigned to Microsoft Technology Licensing LLC (Redmond, Wash.).
"Automated merge conflict resolution" was invented by Christian Bird (Redmond, Wash.), Elizabeth Dinella (Philadelphia), Shuvendu K. Lahiri (Sammamish, Wash.), Todd Douglas Mytkowicz (Redmond, Wash.), Neelakantan Sundaresan (Bellevue, Wash.) and Alexey Svyatkovskiy (Bellevue, Wash.).
According to the abstract* released by the U.S. Patent & Trademark Office: "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...