US Patent 9251235 Log-based synchronization

A device may participate in a shared data state in which editing operations performed locally are distributed and synchronized with other devices participating in the shared data state. Data may be maintained in log-structured storage files on each device. Changes made locally may be conditionally appended to log-structured storage and committed or rolled back during synchronization. Sets of related change descriptors may be identified based on inferred user intent. Conflict resolution rules may be applied to sets of related change descriptors. Conflicts may be resolved through application of conflict resolution rules or through a user-involved process.