Settled

tcmts.cli.merge.Settled · #zc5oqrvq · type

What settling a merge did, beyond the names it merged (#2difbbod).

export interface Settled {
  /** names both sides edited, merged as text */
  textMerged: string[];
  /** names a side deleted that the merged code still uses: kept */
  keptForUse: string[];
  /** names still conflicted, with each definition's side */
  conflicts: { key: string; sides: { hash: string; side: "ours" | "theirs" | undefined }[] }[];
  /** definitions that no longer typecheck after it (to do), by name */
  failed: string[];
}

used by