diff --git a/script/upstream/merge.ts b/script/upstream/merge.ts index 628e962b131..86e869af6bb 100644 --- a/script/upstream/merge.ts +++ b/script/upstream/merge.ts @@ -97,7 +97,7 @@ async function runMergiraf(files: string[]): Promise<{ solved: number; partial: logger.debug(`skipping ${file}: checkout --conflict=diff3 failed (exit ${co.exitCode})`) continue } - const mg = await $`mergiraf solve ${file}`.quiet().nothrow() + const mg = await $`mergiraf solve --keep-backup=false ${file}`.quiet().nothrow() const content = await Bun.file(file) .text() .catch(() => "")