Abstract: 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.

Abstract: A method, at a computing device having one or more processors and memory storing programs for execution by the one or more processors, identifies a conversation including a plurality of participants. A sequence of edits to a content unit in a plurality of content units of the conversation is obtained from a first participant in the plurality of participants to produce a revised content unit. While a second participant of the plurality of participants is providing or editing a portion of the content unit, or viewing the portion of the content unit, the following conditions are imposed. When the second participant is a team member, the conversation is updated for the second participant with the revised content unit by providing the revised content unit to the second participant. When the second participant is a non-team member, updating the conversation for the second participant with the revised content unit is delayed.

Abstract: A method, at a computing device having one or more processors and memory storing programs for execution by the one or more processors, identifies a conversation including a plurality of participants. A sequence of edits to a content unit in a plurality of content units of the conversation is obtained from a first participant in the plurality of participants to produce a revised content unit. While a second participant of the plurality of participants is providing or editing a portion of the content unit, or viewing the portion of the content unit, the following conditions are imposed. When the second participant is a team member, the conversation is updated for the second participant with the revised content unit by providing the revised content unit to the second participant. When the second participant is a non-team member, updating the conversation for the second participant with the revised content unit is delayed.

Abstract: A server system hosts a plurality of conversations. For a respective conversation the server system receives units of content from respective participants in the conversation. The server system receives a sequence of edits to a respective content unit of the conversation from at least one participant other than an initial author of the content unit to produce a revised content unit. The server system stores a respective timestamp for each distinct edit in the sequence of edits to the content unit, including distinct timestamps for at least first and second edits to the content unit. The server system updates the conversation with the revised content unit and automatically provides the updated conversation to the one or more server systems hosting conversations for the participants in the conversation.

Abstract: A server system hosts a plurality of conversations. For a respective conversation the server system receives units of content from respective participants in the conversation. The server system receives a sequence of edits to a respective content unit of the conversation from at least one participant other than an initial author of the content unit to produce a revised content unit. The server system stores a respective timestamp for each distinct edit in the sequence of edits to the content unit, including distinct timestamps for at least first and second edits to the content unit. The server system updates the conversation with the revised content unit and automatically provides the updated conversation to the one or more server systems hosting conversations for the participants in the conversation.

Abstract: 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.