From cbb6bac1b9a4bb1f141b287bfbf2f49a59fd3c6f Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Fri, 10 Apr 2026 08:29:45 -0700 Subject: [PATCH] Expand the lock-file skip list for merge conflict resolution Add bun.lockb, mix.lock, Pipfile.lock, Podfile.lock, pubspec.lock, and uv.lock to SKIP_RESOLVE so generated files from additional ecosystems are auto-resolved with theirs during rebases. Sort entries alphabetically. --- src/commands/helpers.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/commands/helpers.ts b/src/commands/helpers.ts index 8dfa7b8..e114f46 100644 --- a/src/commands/helpers.ts +++ b/src/commands/helpers.ts @@ -81,17 +81,23 @@ export async function teardownSession(root: string, branch: string, worktree: st await state.removeSession(root, branch) } -/** Lock files to skip AI resolution — accept theirs and move on (basename match so `packages/foo/bun.lock` is also covered). */ +/** Generated files to skip AI resolution — accept theirs and move on (basename match so `packages/foo/bun.lock` is also covered). */ const SKIP_RESOLVE = new Set([ "bun.lock", + "bun.lockb", "Cargo.lock", - "package-lock.json", - "yarn.lock", - "pnpm-lock.yaml", - "go.sum", - "Gemfile.lock", "composer.lock", + "Gemfile.lock", + "go.sum", + "mix.lock", + "package-lock.json", + "Pipfile.lock", + "pnpm-lock.yaml", + "Podfile.lock", "poetry.lock", + "pubspec.lock", + "uv.lock", + "yarn.lock", ]) /** Resolve conflict markers in files using Claude, then stage them. */