Conflict Management During Data Object Synchronization Between Client and Server

A server stores server metadata entries corresponding to data objects, each server metadata entry including a server file name and an identifier, distinct from the server file name, for a respective data object. The server receives client metadata entries from a client, each client metadata entry corresponding to a data object for which at least one metadata parameter has changed since a prior execution of a synchronization process. Each client metadata entry includes a client file name and an identifier, distinct from the client file name, for a respective data object corresponding to the client metadata entry. The server synchronizes the received client metadata entries with corresponding server metadata entries, if any, having identifiers that match said identifiers in the received client metadata entries, without regard to whether the corresponding server metadata entries include server file names that match the client file names in the received client metadata entries.