IFClite TypeScript API
    Preparing search index...

    Interface MergeConflict

    interface MergeConflict {
        facetId?: string;
        id: string;
        kind: "field" | "deleteEdit";
        ours: DiffEntry[];
        resolution?: MergeSide;
        specId?: string;
        theirs: DiffEntry[];
    }
    Index
    facetId? id kind ours resolution? specId? theirs
    facetId?: string
    id: string

    Stable id: the conflicting key (facet:<id>:property.value, …).

    kind: "field" | "deleteEdit"

    field: both sides set one field differently. deleteEdit: one side removed a node the other changed.

    ours: DiffEntry[]
    resolution?: MergeSide

    The side applied, or undefined when unresolved (base kept).

    specId?: string

    The node the conflict is about.

    theirs: DiffEntry[]

    Settings
    Member Visibility

    On This Page
    Properties