A computer- implemented method performed on a client device, the method comprising: determining on the client device that a server state for content items stored by a content management system and a file system state for content items stored on the client device are out of sync, wherein the determining is based on at least one of: a server difference between a remote tree representing the server state and a sync tree representing a known synced state between the server state and the file system state, the remote tree and the sync tree being stored on the client device, and a client difference between a local tree representing the file system state and the sync tree representing the known synced state between the server state and the file system state, the local tree being stored on the client device; generating, by the client device, a set of operations configured to converge the server state and the file system state based on the determining that the server state and the file system state are out of sync; detecting, by the client device, a violation of a rule by an operation in the set of operations; identifying, by the client device, a resolution including resolution actions for the violation of the rule; applying, by the client device, the resolution actions to the set of operations; and after applying the resolution actions to the set of operations, generating by the client device a rebased set of operations based on the resolution and the set of operations, wherein the rebased set of operations are provided to a scheduler on the client device for managed execution; receiving, by the client device, a first set of operations corresponding to the rebased set of operations configured to converge the server state and the file system state; receiving, by the client device during implementation of the first set of operations, a second set of operations configured to converge the server state and the file system state after a change to at least one of the server state and the file system state; identifying, by the client device, a first operation in the first set of operations that is not in the second set of operations; and cancelling, by the client device, the first operation. determining on the client device that a server state for content items stored by a content management system and a file system state for content items stored on the client device are out of sync, wherein the determining is based on at least one of: a server difference between a remote tree representing the server state and a sync tree representing a known synced state between the server state and the file system state, the remote tree and the sync tree being stored on the client device, and a client difference between a local tree representing the file system state and the sync tree representing the known synced state between the server state and the file system state, the local tree being stored on the client device; a server difference between a remote tree representing the server state and a sync tree representing a known synced state between the server state and the file system state, the remote tree and the sync tree being stored on the client device, and a client difference between a local tree representing the file system state and the sync tree representing the known synced state between the server state and the file system state, the local tree being stored on the client device; generating, by the client device, a set of operations configured to converge the server state and the file system state based on the determining that the server state and the file system state are out of sync; detecting, by the client device, a violation of a rule by an operation in the set of operations; identifying, by the client device, a resolution including resolution actions for the violation of the rule; applying, by the client device, the resolution actions to the set of operations; and after applying the resolution actions to the set of operations, generating by the client device a rebased set of operations based on the resolution and the set of operations, wherein the rebased set of operations are provided to a scheduler on the client device for managed execution; receiving, by the client device, a first set of operations corresponding to the rebased set of operations configured to converge the server state and the file system state; receiving, by the client device during implementation of the first set of operations, a second set of operations configured to converge the server state and the file system state after a change to at least one of the server state and the file system state; identifying, by the client device, a first operation in the first set of operations that is not in the second set of operations; and cancelling, by the client device, the first operation.