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:
Dec. 13, 2016
Filed:
Mar. 30, 2012
David Charles Kilian, Arlington, VA (US);
Louisa Rose Millott, Ann Arbor, MI (US);
Gareth Alun Jones, Issaquah, WA (US);
Andrew Craig Bragdon, Eastport, ME (US);
Yu Xiao, Issaquah, WA (US);
Arun Mathew Abraham, Redmond, WA (US);
Kevin J. Blasko, Redmond, WA (US);
Christopher Lovett, Woodinville, WA (US);
Mark Groves, Monroe, WA (US);
David Charles Kilian, Arlington, VA (US);
Louisa Rose Millott, Ann Arbor, MI (US);
Gareth Alun Jones, Issaquah, WA (US);
Andrew Craig Bragdon, Eastport, ME (US);
Yu Xiao, Issaquah, WA (US);
Arun Mathew Abraham, Redmond, WA (US);
Kevin J. Blasko, Redmond, WA (US);
Christopher Lovett, Woodinville, WA (US);
Mark Groves, Monroe, WA (US);
Microsoft Technology Licensing, LLC, Redmond, WA (US);
Abstract
Resolving conflicting changes to structured data files. A method includes for a structured data file which has both a generic structure and dialects built on top of the generic structure, for which conflicting changes have been made, and where an original version of the structured data, a first version of the structured data and a second version of the structured data exist, determining a dialect of the structured data. The method further includes, based on the determined dialect performing at least one of merge or diff operations on the original version of the structured data, the first version of the structured data and the second version of the structured data.