IFClite TypeScript API
    Preparing search index...

    Interface MergeConflict

    interface MergeConflict {
        base?: JsonValue;
        key: string;
        kind:
            | "lens"
            | "extension_version"
            | "extension_capabilities"
            | "saved_query"
            | "keybinding"
            | "setting";
        ours: JsonValue;
        theirs: JsonValue;
    }
    Index
    base? key kind ours theirs
    base?: JsonValue
    key: string

    Stable identifier within the conflict kind (extension id, setting key, etc.).

    kind:
        | "lens"
        | "extension_version"
        | "extension_capabilities"
        | "saved_query"
        | "keybinding"
        | "setting"
    ours: JsonValue

    Display-only labels.

    theirs: JsonValue

    Settings
    Member Visibility

    On This Page
    Properties