Resolving conflicts in content management systems

A conflict resolution system is described for reducing false conflicts among entities synchronized within a content management system. A typical content management system maintains a version for an entity that is incremented each time an endpoint modifies the entity, including changes that affect the metadata rather than the content of the entity. The conflict resolution system adds a new content version that is updated when the content of the entity changes. By comparing content version information, endpoints can automatically resolve false conflicts that occur when an endpoint has modified the metadata of the entity.