helpResolve

tcmts.cli.commands.helpResolve · #yz3jarbe · term · runs anywhere

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

export const helpResolve: Help = {
  description:
    "pick one definition for a conflicted name; what used the others is re-derived against it",
  params: {
    name: "a conflicted name",
    hash: "the #hash to keep",
    ours: "keep the definition from this branch's side of the merge (`tcm todo` labels them)",
    theirs: "keep the definition from the merged branch's side",
  },
}

uses

• tcmts.cli.commands.Help

used by

• tcmts.cli.commands.helps