resolve(mergeConflicts:)

Declaration

func resolve(mergeConflicts list: [Any]) throws

Parameters

• list:

  An array of merge conflicts (instances of Nsmergeconflict).

Discussion

If you override this method in a subclass, you should typically invoke the superclass’s implementation in addition to performing your own operations.

See Also

Resolving a Conflict

• resolve(constraintConflicts:)
• resolve(optimisticLockingConflicts:)