Conflict Resolution

• US 20130013997A1
• Filed: 07/09/2012
• Published: 01/10/2013
• Est. Priority Date: 04/28/2008
• Status: Active Grant

• Current Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Original Assignee: Microsoft Corporation
• Inventors: Bailor, Jonathan Beckett, Bernstein, Ethan Joseph, Krout, Kelly Michael, Mizulo, Matthew Eric, Gordner, Jonathan Ian
• Granted Patent: US 9,760,862 B2
• Time in Patent Office: Days
• US Class Current: 715/229
• CPC Class Codes: G06F 16/954 Navigation, e.g. using categorised browsing
• CPC Class Codes: G06Q 10/10 Office automation; Time management

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.

Claims

1. A method of collaboratively authoring a data file, comprising:

displaying the data file;

presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict;

displaying an accept control and a reject control when the editing conflict is selected; and

allowing the user to select the accept control, resulting in accepting the editing conflict, and the reject control, resulting in rejecting the editing conflict.

2. The method of claim 1, further comprising displaying the editing conflict within context of non-conflicting content.

3. The method of claim 2, further comprising identifying the editing conflict to distinguish the editing conflict from the non-conflicting content.

4. The method of claim 3, further comprising displaying an origin of the editing conflict.

5. The method of claim 3, wherein hiding the editing conflict comprises removing identification of the editing conflict.

6. The method of claim 1, further comprising visually alerting the user when the editing conflict is identified.

7. The method of claim 1, further comprising allowing the user to toggle between displaying the editing conflict and hiding the editing conflict.

8. A computer readable storage medium storing executable instructions, which perform a method of resolving editing conflicts in a data file, the method comprising:

displaying the data file;

presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict;

displaying an accept control when the editing conflict is selected; and

allowing the user to select the accept control, resulting in accepting the editing conflict.

9. The computer readable storage medium of claim 8, further comprising displaying the editing conflict within context of non-conflicting content.

10. The computer readable storage medium of claim 9, further comprising identifying the editing conflict to distinguish the editing conflict from the non-conflicting content.

11. The computer readable storage medium of claim 10, further comprising displaying an origin of the editing conflict.

12. The computer readable storage medium of claim 10, wherein hiding the editing conflict comprises removing identification of the editing conflict.

13. The computer readable storage medium of claim 8, further comprising visually alerting the user when the editing conflict is identified.

14. The computer readable storage medium of claim 8, further comprising allowing the user to toggle between displaying the editing conflict and hiding the editing conflict.

15. A system for collaboratively editing a data file, the system comprising:

a processing unit; and

a memory encoding instructions that, when executed by the processing unit, cause the processing unit to;

display the data file;

present to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict;

display a reject control when the editing conflict is selected; and

allow the user to select the reject control, resulting in rejecting the editing conflict.

16. The system of claim 15, wherein the processing unit is further caused to display the editing conflict within context of non-conflicting content.

17. The computer readable storage medium of claim 16, wherein the processing unit is further caused to identify the editing conflict to distinguish the editing conflict from the non-conflicting content.

18. The computer readable storage medium of claim 17, wherein the processing unit is further caused to display an origin of the editing conflict.

19. The computer readable storage medium of claim 15, wherein the processing unit is further caused to visually alert the user when the editing conflict is identified.

20. The computer readable storage medium of claim 15, wherein the processing unit is further caused to allow the user to toggle between displaying the editing conflict and hiding the editing conflict.