Conflict Resolution

Information about different versions of a document in conflict is available through the NSFileVersion class. When the user taps the Resolve Conflict button, the resolveConflictTapped: method is called. This method gathers information about versions of the document in conflict, and instantiates a custom page view controller to allow the user to browse through the versions in conflict and select a winner.

Click here to view code image

- (IBAction)resolveConflictTapped:(id)sender{    NSArray *versions = [NSFileVersion    unresolvedConflictVersionsOfItemAtURL:self.myNoteURL];    NSFileVersion *currentVersion =    [NSFileVersion currentVersionOfItemAtURL:self.myNoteURL];    NSMutableArray *conflictVersions =    [NSMutableArray ...

Get iOS Components and Frameworks: Understanding the Advanced Features of the iOS SDK now with the O’Reilly learning platform.

O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.

Start your free trial