Microsoft Technology Licensing, LLC

Jeffrey Walter Kelly

Brian Keith Pepin

Charles P Jazdzewski

Kenneth Lawrence Young

Mark A Boulter

Gary Linscott

Unnikrishnan Ravindranathan

Ahmed Mohamed Metwally

James Nakashima

Alan J Gasperini

Juraj Hlavac

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.

Pending merge conflict notification

The present invention provides technologies for forming an editing interface for editing arbitrary objects. In particular, the present invention provides system and methods for enumerating object properties, selecting a suitable pre-existing object editor and, if no such pre-existing editor is available, constructing an object editor on the fly suitable for editing the properties of the object where the object may include properties and/or collections of objects. Construction of a suitable editor is based on enumeration of object properties and on the serialization of the object using a descriptive language such as extensible markup language ('XML') or the like. Property values specified by a user via the object interface and editors are stored in a descriptive format such as XML and generally specify the initial characteristics of the object.

Arbitrary object editing

Growing community of inventors

Kirkland, WA, United States of America

Jeffrey Walter Kelly