markmv - v1.26.2
    Preparing search index...

    Interface MergeConflict

    Represents a conflict detected during the merge operation.

    Conflicts can arise from header collisions, content overlaps, or transclusion loops that require resolution.

    interface MergeConflict {
        type:
            | "content-overlap"
            | "header-collision"
            | "transclusion-loop"
            | "frontmatter-conflict";
        description: string;
        sourceFiles: string[];
        resolution?: string;
        lines?: number[];
        autoResolved: boolean;
    }
    Index

    Properties

    type description sourceFiles resolution? lines? autoResolved

    Properties

    type:
        | "content-overlap"
        | "header-collision"
        | "transclusion-loop"
        | "frontmatter-conflict"

    Type of conflict

    description: string

    Description of the conflict

    sourceFiles: string[]

    Source files involved

    resolution?: string

    Suggested resolution strategy

    lines?: number[]

    Line numbers where conflict occurs

    autoResolved: boolean

    Whether conflict was auto-resolved

    Settings

    Member Visibility

    On This Page

    Properties