From 29cbf29b76100eb24e7764a688fe41dd68839f9f Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Tue, 7 Apr 2026 09:26:55 -0700 Subject: [PATCH] Remove lock files instead of resolving them during conflict resolution Lock files like bun.lock and Cargo.lock get regenerated, so resolving their conflict markers is unnecessary work. --- src/commands/helpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/helpers.ts b/src/commands/helpers.ts index ef58ac5..6872fe3 100644 --- a/src/commands/helpers.ts +++ b/src/commands/helpers.ts @@ -81,7 +81,7 @@ export async function teardownSession(root: string, branch: string, worktree: st 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"]) /** Resolve conflict markers in files using Claude, then stage them. */