A method comprising: generating, at a client device, an operation modifying a local copy of a content item associated with a user account at a content management system; recording, at the client device, an intent to commit the operation to a journal of revisions on the content management system, the journal of revisions tracking revisions to content items associated with one or more namespaces associated with the user account; based on the operation, sending, by the client device to the content management system, a first request to commit the operation to the journal of revisions, the first request comprising a cursor identifying a current position of the client device at the journal of revisions; sending, by the client device to the content management system, a second request for a status of the commit at content management system; receiving, by the client device from the content management system, a response to the second request; determining, by the client device, whether the response comprises an indication that the commit of the operation to the journal of revisions succeeded; based on whether the response comprises the indication that the commit of the operation to the journal of revisions succeeded, determining whether to update a synchronization tree representing a previously known synchronized state between a file system state and a server state associated with the content items including the content item and a remote tree representing the server state of content items stored remotely from the client device and associated with the user account at the content management system, and clearing the intent to commit; based on a comparison between the synchronization tree and at least one of the remote tree and a local tree representing the file system state of content items stored at the client device and associated with the user account at the client device, identifying a difference between the server state and the file system state; generating a sequence of operations configured to converge the identified difference between the server state of content items associated with the user account at the content management system and the file system state of content items associated with the user account at the client device; and executing the sequence of operations to converge the server state and the file system state. generating, at a client device, an operation modifying a local copy of a content item associated with a user account at a content management system; recording, at the client device, an intent to commit the operation to a journal of revisions on the content management system, the journal of revisions tracking revisions to content items associated with one or more namespaces associated with the user account; based on the operation, sending, by the client device to the content management system, a first request to commit the operation to the journal of revisions, the first request comprising a cursor identifying a current position of the client device at the journal of revisions; sending, by the client device to the content management system, a second request for a status of the commit at content management system; receiving, by the client device from the content management system, a response to the second request; determining, by the client device, whether the response comprises an indication that the commit of the operation to the journal of revisions succeeded; based on whether the response comprises the indication that the commit of the operation to the journal of revisions succeeded, determining whether to update a synchronization tree representing a previously known synchronized state between a file system state and a server state associated with the content items including the content item and a remote tree representing the server state of content items stored remotely from the client device and associated with the user account at the content management system, and clearing the intent to commit; based on a comparison between the synchronization tree and at least one of the remote tree and a local tree representing the file system state of content items stored at the client device and associated with the user account at the client device, identifying a difference between the server state and the file system state; generating a sequence of operations configured to converge the identified difference between the server state of content items associated with the user account at the content management system and the file system state of content items associated with the user account at the client device; and executing the sequence of operations to converge the server state and the file system state.