Conflict Resolver
From Wikipedia, the free encyclopedia
Conflict Resolver | |
---|---|
Developed by | Apple Computer |
Latest release | 1.0 / 2004 |
OS | 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, thus a conflict. The user is then 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 is located in /System/Library/CoreServices/Conflict Resolver.app.
Conflict Resolver is also used when using iSync to sync data between the computer and a PDA such as a Palm.