Managing conflicted copies

Abstract

Various embodiments provide a method of managing and preventing conflicted copies of a content item. For example, as changes are made to a content item, either by multiple users simultaneously or by a single user utilizing multiple devices, conflicted copies can be inadvertently created. These conflicted copes are multiple copies of the same content item where each copy may separately contain unique changes. Heuristics can be used to help users more easily avoid or manage these conflicted copies. In one example, a user could be notified and shown the difference between copies to either accept or reject changes. Further, users could also be notified when modifying a content item on a device that has not been synchronized in a determined period of time, or when the content item is known to be modified but the changes have yet to be synchronized to the device.