Type Alias MergeConflictKind

MergeConflictKind:
    | "concurrent-edit"
    | "delete-vs-modify"
    | "modify-vs-delete"
    | "hierarchy"

Conflict taxonomy, lifted from collab/conflicts/detector.ts kinds from session level to merge level (05 §5.3).