defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Expand the lock-file skip list for merge conflict resolution

Browse Source 
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.
This commit is contained in:
Chris Wanstrath 2026-04-10 08:29:45 -07:00
parent 85cf9cc02f
commit cbb6bac1b9
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/helpers.ts
View File

@ -81,17 +81,23 @@ export async function teardownSession(root: string, branch: string, worktree: st
await state.removeSession(root, branch) 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([ const SKIP_RESOLVE = new Set([
"bun.lock", "bun.lock",
"bun.lockb",
"Cargo.lock", "Cargo.lock",
"package-lock.json",
"yarn.lock",
"pnpm-lock.yaml",
"go.sum",
"Gemfile.lock",
"composer.lock", "composer.lock",
"Gemfile.lock",
"go.sum",
"mix.lock",
"package-lock.json",
"Pipfile.lock",
"pnpm-lock.yaml",
"Podfile.lock",
"poetry.lock", "poetry.lock",
"pubspec.lock",
"uv.lock",
"yarn.lock",
]) ])
/** Resolve conflict markers in files using Claude, then stage them. */ /** Resolve conflict markers in files using Claude, then stage them. */