Inventors:
- Redmond WA, US
Robert R. Klingenberg - San Carlos CA, US
Evelyn G. Salazar - Sunnyvale CA, US
Andrey A. Efimchik - Sunnyvale CA, US
Jonathan Rutherfurd - Santa Clara CA, US
Yanling Wang - Belmont CA, US
Shawn Villaron - San Jose CA, US
International Classification:
G06F 17/22
G06F 17/24
G06F 3/0484
G06F 17/21
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.
