O'Reilly logo

iOS Components and Frameworks: Understanding the Advanced Features of the iOS SDK by Joe Keeley, Kyle Richter

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

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.

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

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required