The patent badge is an abbreviated version of the USPTO patent document. The patent badge does contain a link to the full patent document.
The patent badge is an abbreviated version of the USPTO patent document. The patent badge covers the following: Patent number, Date patent was issued, Date patent was filed, Title of the patent, Applicant, Inventor, Assignee, Attorney firm, Primary examiner, Assistant examiner, CPCs, and Abstract. The patent badge does contain a link to the full patent document (in Adobe Acrobat format, aka pdf). To download or print any patent click here.
Patent No.:
Date of Patent:
Mar. 17, 2020
Filed:
May. 02, 2018
Microsoft Technology Licensing, Llc, Redmond, WA (US);
Kenneth Lawrence Young, Sammamish, WA (US);
Ahmed Mohamed Metwally, Bothell, WA (US);
Jeffrey Walter Kelly, Kirkland, WA (US);
MICROSOFT TECHNOLOGY LICENSING, LLC, Redmond, WA (US);
Abstract
A first client computing device, including a display and a processor. The processor may execute a distributed source code authoring management system client configured to communicate with a codebase host server. The processor may output a graphical user interface (GUI) of the distributed source code authoring management system client and may receive a first edit to a code file in an editor window included in the GUI. The editor window may provide real-time mark-up of the code file. In response to the first edit, the processor may transmit change set information including the first edit to a codebase host server. The processor may receive, from the codebase host server, a first conflict notification indicating that the first edit and a second edit to the code file have a pending merge conflict. The processor may output the first conflict notification to the display for display in the editor window.