1. A computer-implemented method for resolving text change conflicts, comprising: receiving at a client an update notification from a server that includes an update to a current version of text that is co-edited by clients, wherein the server selects a text change from text changes received from one or more of the clients that is used to update the current version of the text; determining at the client, when the client has a non-selected text change to update the current version of the text that was sent to the server but not selected by the server to update the current version of the text; initiating a conflict resolution procedure on the client to create an updated text change to reflect the updated current version of the text and the non-selected text change; and submitting the updated text change to the server to update the current version of the text.
1. A computer-implemented method for resolving text change conflicts, comprising: receiving at a client an update notification from a server that includes an update to a current version of text that is co-edited by clients, wherein the server selects a text change from text changes received from one or more of the clients that is used to update the current version of the text; determining at the client, when the client has a non-selected text change to update the current version of the text that was sent to the server but not selected by the server to update the current version of the text; initiating a conflict resolution procedure on the client to create an updated text change to reflect the updated current version of the text and the non-selected text change; and submitting the updated text change to the server to update the current version of the text. 7. The method of claim 1 , further comprising updating a client version of the text when it is determined that the client does not have the non-selected text change to update the current version of the text.