Merging instances of a modular document

摘要

A first instance of a modular document is received, where the modular document is composed of plural parts, and where the modular document contains a merge definition. A second instance of the modular document is received, where the second instance and the first instance of the modular document have been modified with respect to each other. The second instance is merged with the first instance, where any conflict between the second instance and the first instance is resolved according to the merge definition.

主权项

1. A method comprising:
receiving, by an electronic device, a first instance of a modular document composed of plural parts, wherein the modular document contains a merge definition; receiving, by the electronic device, a second instance of the modular document, wherein the first instance and the second instance of the modular document have been modified with respect to each other, wherein the second instance also contains a merge definition; and determining whether any conflict exists between the merge definition of the second instance and the merge definition of the first instance, wherein each of the merge definitions provides information regarding how conflicts in the first and second instances are to be resolved.