Legal claims defining the scope of protection, as filed with the USPTO.
1. A system comprising: at least one processor; and memory coupled to the at least one processor, the memory having computer-executable instructions for resolving conflicts to co-edited text that, when executed by the at least one processor, performs a method comprising: receiving, at a server, a first notification from a first client, wherein the first notification indicates a difference between a first client version of a co-edited text accessed by the first client and a master version of the co-edited text accessed by the server; receiving, at the server, a second notification from a second client, wherein the second notification indicates a second difference between a second client version of the co-edited text accessed by the second client and the master version of the co-edited text; in response to receiving the first notification and the second notification, selecting a policy to determine a difference notification, wherein the difference notification comprises one of the first notification or the second notification; selecting the difference notification to process based on the selected policy; updating the master version of the co-edited text with the selected difference notification to provide an updated master version of the co-edited text; and sending an update notification reflecting the selected text change to the first client and the second client.
2. The system of claim 1 , wherein the policy is a first person wins policy that selects a first text change received.
3. The system of claim 1 , wherein the server selects a single text change and ignores any other text changes.
4. The system of claim 1 , wherein the updated notification sent to the clients comprises deltas to the current version of the text.
5. The system of claim 1 , wherein the conflict resolution procedure is performed by clients and not performed by the server.
6. The system of claim 1 , wherein the conflict resolution policy comprises merging text of the non-selected text change with the update to the current version of the text.
7. A method for resolving conflicts to co-edited text, comprising: receiving, at a server, a first notification from a first client, wherein the first notification indicates a difference between a first client version of a co-edited text accessed by the first client and a master version of the co-edited text accessed by the server; receiving, at the server, a second notification from a second client, wherein the second notification indicates a second difference between a second client version of the co-edited text accessed by the second client and the master version of the co-edited text; in response to receiving the first notification and the second notification, selecting a policy to determine a difference notification, wherein the difference notification comprises one of the first notification or the second notification; selecting the difference notification to process based on the selected policy; updating the master version of the co-edited text with the selected difference notification to provide an updated master version of the co-edited text; and sending an update notification reflecting the selected text change to the first client and the second client.
8. The method of claim 7 , wherein the policy is a first person wins policy that selects a first text change received.
9. The method of claim 7 , wherein the server selects a single text change and ignores any other text changes.
10. The method of claim 7 , wherein the updated notification sent to the clients comprises deltas to the current version of the text.
11. The method of claim 7 , wherein the conflict resolution procedure is performed by clients and not performed by the server.
12. The method of claim 7 , wherein the conflict resolution policy comprises merging text of the non-selected text change with the update to the current version of the text.
13. The method of claim 7 , wherein the conflict resolution procedure is performed by the client when it is determined that the client has a non-selected text change.
14. A computer storage device comprising: a processor; and memory coupled to the processor, the memory having computer-executable instructions that, when executed by the processor, performs a method comprising: receiving, at a server, a first notification from a first client, wherein the first notification indicates a difference between a first client version of a co-edited text accessed by the first client and a master version of the co-edited text accessed by the server; receiving, at the server, a second notification from a second client, wherein the second notification indicates a second difference between a second client version of the co-edited text accessed by the second client and the master version of the co-edited text; in response to receiving the first notification and the second notification, selecting a policy to determine a difference notification, wherein the difference notification comprises one of the first notification or the second notification; selecting the difference notification to process based on the selected policy; updating the master version of the co-edited text with the selected difference notification to provide an updated master version of the co-edited text; and sending an update notification reflecting the selected text change to the first client and the second client.
15. The computer storage device of claim 14 , wherein the policy is a first person wins policy that selects a first text change received.
16. The computer storage device of claim 14 , wherein the server selects a single text change and ignores any other text changes.
17. The computer storage device of claim 14 , wherein the updated notification sent to the clients comprises deltas to the current version of the text.
18. The computer storage device of claim 14 , wherein the conflict resolution procedure is performed by clients and not performed by the server.
19. The computer storage device of claim 14 , wherein the conflict resolution policy comprises merging text of the non-selected text change with the update to the current version of the text.
20. The computer storage device of claim 14 , wherein the conflict resolution procedure is performed by the client when it is determined that the client has a non-selected text change.
Unknown
March 31, 2020
Browse 5M+ US patents with plain-English claim translations and AI-generated analysis.