MergeResult

tcmts.cli.merge.MergeResult · #zunmzzlm · type

import type { NameState } from "#codebase/tcmts/cli/diff";

export interface MergeResult {
  merged: NameState;
  /** names both sides changed differently: they now hold both definitions */
  conflicts: string[];
  /** names one side deleted while the other changed them: the change is kept */
  keptOverDelete: string[];
  /** old → new for every name exactly one side updated, so the other side's code can follow */
  patches: Map<string, string>;
}

uses

used by