US Patent Issued to Microsoft Technology Licensing on July 21 for "Automatically resolving merge conflicts in a computer system" (Washington Inventors)

ALEXANDRIA, Va., July 21 -- United States Patent no. 12,688,033, issued on July 21, was assigned to Microsoft Technology Licensing LLC (Redmond, Wash.).

"Automatically resolving merge conflicts in a computer system" was invented by Amritam Sarcar (Sammamish, Wash.), Andrew Stephen Zeigler (Redmond, Wash.), Hitesh Kanwathirtha (Woodinville, Wash.), Zachary Michael Murphy (Seattle), Javier Nisim Flores Assad (Bothell, Wash.) and Jeffrey Tzu Heng Lin (Redmond, Wash.).

According to the abstract* released by the U.S. Patent & Trademark Office: "Merge conflicts are identified when changes from two different developers are merged into a code base in a code repository. When the changes from the two different developers conflict with one another, ...