Interface ConflictCard

interface ConflictCard {
    id: string;
    kind: "field" | "deleteEdit";
    ours: string[];
    resolution?: MergeSide;
    theirs: string[];
    title: string;
}

Index

Properties

id kind ours resolution? theirs title

Properties

id

id: string

kind

kind: "field" | "deleteEdit"

ours

ours: string[]

`Optional`resolution

resolution?: MergeSide

theirs

theirs: string[]

title

title: string

The specification the conflict is about, by name.