defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Remove lock files instead of resolving them during conflict resolution

Browse Source 
Lock files like bun.lock and Cargo.lock get regenerated, so resolving
their conflict markers is unnecessary work.
This commit is contained in:
Chris Wanstrath 2026-04-07 09:26:55 -07:00
parent 1143bf08c9
commit 29cbf29b76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/helpers.ts
View File

@ -81,7 +81,7 @@ export async function teardownSession(root: string, branch: string, worktree: st
await state.removeSession(root, branch) await state.removeSession(root, branch)
} }
/** Files that should be resolved by accepting "theirs" instead of using Claude. */ /** Files that should be removed rather than resolved — they get regenerated. */
const SKIP_RESOLVE = new Set(["bun.lock", "Cargo.lock"]) const SKIP_RESOLVE = new Set(["bun.lock", "Cargo.lock"])
/** Resolve conflict markers in files using Claude, then stage them. */ /** Resolve conflict markers in files using Claude, then stage them. */