abortMerge

tcmts.studio.abortMerge · #6wspaqke · term · runs on the server

uses tcmts.studio.editableCodebase, which uses tcmts.share.servedCodebase, which uses process

Drop the merge waiting apart on the studio's branch, as tcm merge --abort does: the branch is as it was all along.

import { editableCodebase, runTcm, tcmSaid } from "#codebase/tcmts/studio";

export async function abortMerge(): Promise<string> {
  const cb = editableCodebase();
  return tcmSaid(
    await runTcm(cb.lay.root, ["merge", "--abort"], { branch: true }),
    "tcm merge --abort",
  );
}

uses

used by