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. */