Conflict Resolver

From Wikipedia, the free encyclopedia

Jump to: navigation, search
Conflict Resolver
Conflict Resolver
Developer(s) Apple Computer
Stable release 1.0 / 2004
Operating system Mac OS X
Website http://www.mac.com

Conflict Resolver is an application used by Apple Computer's .Mac service. Conflict Resolver is executed in the event that the .Mac 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 (.Mac or local) and whether the user wishes to apply the same changes to all or make them individually. The program may be found either at: /System/Library/PrivateFrameworks/SyncServicesUI.framework/Versions/A/Resources/Conflict Resolver.app (in Mac OSX 10.5) or

/System/Library/CoreServices/Conflict Resolver.app (in Mac OSX 10.4).

Conflict Resolver is also used when using iSync to sync data between the computer and a PDA such as a Palm, or iTunes to sync with an iPhone or iPod Touch.

[edit] External links

Languages