Conflict resolution
First Claim
Patent Images
1. A method of collaboratively authoring a data file, comprising:
- displaying the data file in an authoring window within a user interface;
presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict;
in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised;
in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control and a reject control; and
allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict.
1 Assignment
0 Petitions
Accused Products
Abstract
Embodiments of a collaborative authoring environment enable a user to resolve editing conflicts arising when synchronizing a user copy of a data file with a master copy of the data file. Content updates may be synchronized separately from metadata updates. Metadata updates may be synchronized automatically, whereas content updates may be synchronized only when any identified editing conflicts are resolved. When an editing conflict is identified, the user interface of the authoring application may be configured to toggle between displaying and hiding the identified editing conflicts.
345 Citations
20 Claims
-
1. A method of collaboratively authoring a data file, comprising:
-
displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control and a reject control; and allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict. - View Dependent Claims (2, 3, 4, 5, 6, 7)
-
-
8. A computer readable storage hardware device, not including a propagating signal, storing executable instructions, which perform a method of resolving editing conflicts in a data file, the method comprising:
-
displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control; and allowing the user to select the accept control, resulting in accepting the editing conflict. - View Dependent Claims (9, 10, 11, 12, 13, 14)
-
-
15. A system for collaboratively editing a data file, the system comprising:
-
a computer processing unit; and a memory encoding instructions that, when executed by the processing unit, cause the processing unit to; display the data file in an authoring window within a user interface; present to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, display a reject control; and allow the user to select the reject control, resulting in rejecting the editing conflict. - View Dependent Claims (16, 17, 18, 19, 20)
-
Specification