Merged

tcmts.cli.merge.Merged · #bse2ntws · type

A definition's two sides merged three-way as text: text whole (a scratch file's, without its namespace line), body its code (or a file's lines), imports what code imports (one name an import), each side's changes: where they are in body (Stretch) and how many lines each added and removed; conflicts, how many are marked.

import type { Stretch } from "#codebase/tcmts/cli/merge";

export interface Merged {
  text: string;
  conflicts: number;
  body: string[];
  imports?: string[];
  stretches: Stretch[];
  changed: Record<"ours" | "theirs", { added: number; removed: number }>;
}

uses

used by