Conflict

tcmts.cli.merge.Conflict · #jkuzvrrr · type

A conflicted name as it is now: its definitions, each with the side it came from where that's known.

export interface Conflict {
  /** the name as merges key it: a type's with ` (type)` */
  key: string;
  path: string;
  /** the merge base's definition, where it had one */
  base?: string;
  sides: { hash: string; side?: "ours" | "theirs"; label?: string }[];
}

used by