Interface Resolution

interface Resolution {
conflicts: string[];
merged: Fields;
}

Index

Properties

conflicts merged

Properties

conflicts

conflicts: string[]

names (fieldName) of fields both sides changed differently

merged

merged: Fields