IFClite TypeScript API
    Preparing search index...

    Interface MergeConflict

    @ifc-lite/merge — three-way merge engine for IFCX layers.

    Built on two runs of the two-way comparison joined on entity identity: emits a MergePlan (auto-merged ops + explicit conflict records), applies reviewer resolutions, publishes content-addressed merge layers with manifest.merge filled, and derives revert and rebase from the same state-based op model.

    Spec: docs/architecture/layer-prs/05-merge.md.

    interface MergeConflict {
        base?: ComponentSnapshot;
        componentKey?: string;
        kind: MergeConflictKind;
        ours?: ComponentSnapshot;
        path: string;
        subtree?: string[];
        theirs?: ComponentSnapshot;
    }
    Index
    base? componentKey? kind ours? path subtree? theirs?
    base?: ComponentSnapshot

    Ancestor value (undefined when the component did not exist in A).

    componentKey?: string

    Component the conflict is scoped to; absent for entity-level kinds.

    kind: MergeConflictKind
    ours?: ComponentSnapshot

    Target-side value (undefined when removed/absent on ours).

    path: string

    Entity path the conflict is on.

    subtree?: string[]

    For an entity-level delete conflict whose tombstone shadow-kills descendants the other side touched: their paths. The delete decision on THIS entity carries the whole subtree - per-descendant choices against a dead ancestor would be unsatisfiable (subtree shadowing beats a child resurrect at composition time).

    theirs?: ComponentSnapshot

    Candidate-side value (undefined when removed/absent on theirs).

    Settings
    Member Visibility

    On This Page
    Properties