opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-09-19 01:51:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(upstream): disable mergiraf .orig backups

Browse Source 
mergiraf defaults to writing a .orig sibling file for every file it
touches. Pass --keep-backup=false so the merge script doesn't leave a
pile of .orig files across the working tree after running.
This commit is contained in:
Mark IJbema
2026-04-28 14:26:17 +02:00
parent 24146a2171
commit e6f387e2dd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/upstream/merge.ts
+1 -1
View File
@@ -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(() => "")