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. 15, 2016
Filed:
Oct. 17, 2012
Apollo Group, Inc., Phoenix, AZ (US);
Locke David Berkebile, Alamo, CA (US);
Isabel George, Foster City, CA (US);
David Le, San Jose, CA (US);
Manish Upendran, San Jose, CA (US);
Ted Wong, San Francisco, CA (US);
Sravanthi Deshmukh, Milpitas, CA (US);
Jongwoo Lee, San Francisco, CA (US);
Apollo Education Group, Inc., Phoenix, AZ (US);
Abstract
Techniques are described for resolving document change conflicts based on state information. A document management system records, at a client device, changes that a user made to a root client-side instance of a document bundle to create a modified client-side instance of the document bundle, wherein the changes were made while the client device was not connected to a remote storage service. After the changes are recorded, the client device is connected to the remote storage service. In response to determining that a conflict has occurred, the document management system selects a particular resolution action, based, at least in part, on state information associated with at least one of: a user that made the changes, an instance of the document bundle, or the client device on which the changes were made. The document management system then resolves the conflict by performing the particular resolution action.