In implementations of systems for resolving conflicts in collaborative digital content editing, a computing device implements a resolution system to apply a content editing operation to a digital object. The resolution system writes an indication of the content editing operation at a first position of a local transaction stack of editing operations. The resolution system transmits editing data via a network describing the content editing operation for receipt by a server system. Relay data is received via the network from the server system describing an additional content editing operation for application to the digital object. The resolution system determines a conflict between the additional content editing operation and the content editing operation and writes an indication of the additional content editing operation at a second position of the local transaction stack of editing operations that is before the first position.