SYSTEM AND METHOD FOR MERGING EDITS FOR A CONVERSATION IN A HOSTED CONVERSATION SYSTEM

摘要

A server system hosts a plurality of conversations. For a respective conversation the server system receives a first sequence of edits and a second sequence of edits to a respective content unit of the conversation from different participants of the conversation. The server system converts the first and second sequences of edits into respective first and second merged sequences of edits. The server system responds to a determination that the first merged sequence of edits and the second merged sequence of edits meet predefined conflict criteria by transforming the first and second merged sequences of edits. The server system sends the respective transformed sequences of edits to respective participants so that respective participants can apply either the first sequence of edits followed by the second transformed sequence of edits or applying the second sequence of edits followed by the first transformed sequence of edits to produce a same result.