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.

Date of Patent:
Oct. 03, 2017

Filed:

Jul. 29, 2014
Applicant:

Microsoft Corporation, Redmond, WA (US);

Inventors:

James Yamat, Redwood City, CA (US);

Robert R. Klingenberg, San Carlos, CA (US);

Evelyn G. Salazar, Sunnyvale, CA (US);

Andrey A. Efimchik, Sunnyvale, CA (US);

Jonathan Rutherfurd, Redmond, WA (US);

Yanling Wang, Belmont, CA (US);

Shawn Villaron, San Jose, CA (US);

Assignee:
Attorney:
Primary Examiner:
Int. Cl.
CPC ...
G06F 17/24 (2006.01); G06F 17/22 (2006.01); G06F 17/21 (2006.01); G06F 3/0484 (2013.01);
U.S. Cl.
CPC ...
G06F 17/2288 (2013.01); G06F 3/04842 (2013.01); G06F 17/211 (2013.01); G06F 17/2211 (2013.01);
Abstract

A first set of changes to a first version of a digital document, as compared to a baseline version of the document, can be detected. The first set of changes can include a first change to a page of the document in the first version of the document, as compared to the baseline version of the document. Also, a second set of changes to a second version of a document, as compared to the baseline version of the document, can be detected. The second set of changes can include a second change to the page of the document in the second version of the document, as compared to the baseline version of the document. A conflict between the first change and the second change can be detected, and the conflict can be resolved by receiving user input or applying conflict resolution rule(s) to choose between the first and second changes.


Find Patent Forward Citations

Loading…