US 12,452,321 B2
Systems for resolving conflicts in collaborative digital content editing
Tarun Beri, Noida (IN)
Assigned to Adobe Inc., San Jose, CA (US)
Filed by Adobe Inc., San Jose, CA (US)
Filed on Apr. 27, 2023, as Appl. No. 18/140,192.
Application 18/140,192 is a continuation of application No. 17/411,282, filed on Aug. 25, 2021, granted, now 11,683,354.
Prior Publication US 2024/0137397 A1, Apr. 25, 2024
Prior Publication US 2024/0236160 A9, Jul. 11, 2024
Int. Cl. H04L 65/401 (2022.01); G06F 16/176 (2019.01)
CPC H04L 65/401 (2022.05) [G06F 16/1767 (2019.01)] 20 Claims
OG exemplary drawing
 
1. A method comprising:
receiving, by a processing device of a collaboration server via a network, input data from a first client device describing a content editing operation to a digital object;
writing, by the processing device, an indication of the content editing operation at a most recent position of a stack of editing operations of the collaboration server;
receiving, by the processing device via the network, additional input data from a second client device;
determining, by the processing device, that the additional input data describes a conflicting content editing operation to the digital object and that the conflicting content editing operation occurs before the processing device receives the input data based on a time of the conflicting content editing operation received from the second client device;
transmitting, by the processing device via the network and in response to determining the conflicting content editing operation occurs before the processing device receives the input data, relay data from the collaboration server to the first client device and the second client device including instructions configured to:
cause the first client device and the second client device to perform an editing operation to undo the content editing operation; and
cause the first client device and the second client device to perform the conflicting content editing operation;
writing, by the processing device, an indication of the conflicting content editing operation at a position of the stack of editing operations that is before the most recent position; and
writing, by the processing device, an edit to the indication of the content editing operation that identifies the editing operation to undo the content editing operation.