helpMerge

tcmts.cli.commands.helpMerge · #ohvtkihe · term · runs anywhere

import type { Help } from "#codebase/tcmts/cli/commands";

export const helpMerge: Help = {
  description:
    "merge another branch's history into this one (three-way from their common ancestor); one that leaves conflicts or code that stops typechecking waits apart, this branch untouched, until it's settled; on main, a branch lands (main merged into it first, there, then its tests)",
  params: {
    branch: "the branch to merge",
    "no-fast-forward":
      "a merge entry even where it could fast-forward: what came in is one entry, which `tcm revert` undoes whole",
    squash:
      "what came in as one entry whose only parent is this branch's: the other's history entries stay its own, so pushing this branch sends only what it names now (how sessions land); a branch that made releases keeps its history, which they're entries of",
    abort:
      "drop the merge into this branch that isn't finished (this branch is as it was all along)",
  },
}

uses

used by