forgetConflict

tcmts.cli.merge.forgetConflict · #jemov5vh · term · runs anywhere

Forget a conflict's sides: it's resolved.

import type { Codebase } from "#codebase/tcmts/cli/codebase";
import { stateKey } from "#codebase/tcmts/cli/diff";
import { conflictSetting } from "#codebase/tcmts/cli/merge";
import type { DefKind } from "#codebase/tcmts/core/types";

export function forgetConflict(cb: Codebase, path: string, kind: DefKind): void {
  cb.store.deleteSetting(conflictSetting(cb, stateKey(path, kind)));
}

uses

used by