PendingMerge

tcmts.cli.merge.PendingMerge · #gfmqymal · type

A merge not finished: what it left to settle (conflicts, definitions that stopped typechecking) keeps it apart from the branch it's into, which stays where it was (from) until there's nothing left. Kept as the setting merging <branch>.

import type { Store } from "#codebase/tcmts/store";

export interface PendingMerge {
  /** the branch merged in */
  theirs: string;
  /** where the branch was when the merge began: where it stays meanwhile */
  from: string;
  /** the merge as it is now (its entry, and every one settling it since) */
  head: string;
  /** the merge's patches and what it has to fix, as they are now */
  work: ReturnType<Store["workOf"]>;
  /** what needed fixing before the merge (not the merge's to settle) */
  before: string[];
  /** the settings the merge recorded its conflicts' sides in */
  conflictKeys: string[];
}

uses

used by