Merge two flavors derived from a common ancestor. Always produces a result + conflict list, never throws on data shape (assumes inputs have already passed validateFlavor).
validateFlavor
Merge two flavors derived from a common ancestor. Always produces a result + conflict list, never throws on data shape (assumes inputs have already passed
validateFlavor).