Daff - Data Diff

daff.Merger

Merge changes made in one table into another, given knowledge of a common ancestor.

Type: class

Constructor:

new(parent : Table, local : Table, remote : Table, flags : CompareFlags)

Parameters:

  • parent the common ancestor
  • local the reference table into which changes will be merged
  • remote the table we are pulling changes from

Methods:

apply () : Int
  Go ahead and merge.

Returns: the number of conflicts found during the merge

getConflictInfos () : Array<ConflictInfo>