Conflict Resolver
It is proposed that this article be deleted because of the following concern:
If you can address this concern by improving, copyediting, sourcing, renaming, or merging the page, please edit this page and do so. You may remove this message if you improve the article or otherwise object to deletion for any reason. Although not required, you are encouraged to explain why you object to the deletion, either in your edit summary or on the talk page. If this template is removed, do not replace it. The article may be deleted if this message remains in place for seven days, i.e., after 01:30, 4 July 2024 (UTC). Find sources: "Conflict Resolver" – news · newspapers · books · scholar · JSTOR |
Developer(s) | Apple Inc. |
---|---|
Stable release | 5.1
/ 2009 |
Operating system | Mac OS X |
License | Proprietary |
Website | Mac OS X Website |
Conflict Resolver is an application used by Apple's sync services. Data can be synced between services like MobileMe and Gmail to devices like Macs, PCs, and mobile devices. The sync services are utilized by several applications including Address Book, iCal, Mail. Conflict Resolver is executed in the event that a sync service cannot decide on which version of the data to use, creating a conflict. The user is prompted to choose which version of the data to use (MobileMe or local) and whether the user wishes to apply the same changes to all conflicts or review them individually.
Conflict Resolver resides at:
/System/Library/PrivateFrameworks/SyncServicesUI.framework/Versions/A/Resources/Conflict Resolver.app in versions of Mac OS X since 10.5. In Mac OS X 10.4, the application was located at /System/Library/CoreServices/Conflict Resolver.app.