A method of resolving conflicts between revisions to a distributed virtual file system is implemented at a computing device that is communicatively connected to a plurality of storage devices. The virtual file system at the computing device has a first revision of the virtual file system. Upon receipt of a request to synchronize the first revision of the virtual file system with the storage devices, the computing device retrieves one or more blocks from the storage devices, which are associated with a second revision of the virtual file system. The computing device then merges a first component of the first revision with a corresponding component of the second revision if a first predefined condition is met or identifies a second component of the first revision as being conflicted with a corresponding component of the second revision if a second predefined set of conditions is met.