fix(build): remove Git conflict markers committed to pnpm-lock.yaml - #779
Conversation
The #773 squash merge landed pnpm-lock.yaml with unresolved conflict markers plus a stale overrides block. pnpm ≥8 auto-merges the markers in memory so GitHub Actions stayed green, but every Vercel deployment for that head failed (0 markers at the last green deploy, 3 at the failing one). Removing the block is a pure deletion — no resolution changes, so the deliberate adm-zip exclusion and sharp/transformers pins are kept.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Blocked merge diagnosis — blocked |
 |
|
Overall Grade |
Security Reliability Complexity Hygiene |
Code Review Summary
| Analyzer | Status | Updated (UTC) | Details |
|---|---|---|---|
| JavaScript |  |
Sep 12, 2026 1:45p.m. | Review ↗ |
| Python | |
Sep 12, 2026 1:45p.m. | Review ↗ |
| Shell | |
Sep 12, 2026 1:45p.m. | Review ↗ |
| SQL | |
Sep 12, 2026 1:45p.m. | Review ↗ |
Important
AI Review is run only on demand for your team. We're only showing results of static analysis review right now. To trigger AI Review, comment @deepsourcebot review on this thread.
GitNexus Review · PR #779GitNexus reviewed 2 changed files. 🤖 Agent context — 2 filesSummaryThis appears to be a small build configuration cleanup centered on the package lockfile, with no graph-visible downstream reach. Review risk is low and concentrated in the lockfile content and its accompanying plan. 🟢 LOW blast radius. A build-related change to The change is confined to the repository lockfile and a planning document. Review
What changedChanged Files (2)
What to checkFile Risk (2)
Full detail lives in the GitNexus check run for this commit. |
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 0 |
| Duplication | 0 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
1 participant
Problem
Every Vercel deployment for
mainhead3787e337failed:All GitHub-hosted checks were green, so CI could not see it.
Root cause
pnpm-lock.yamlwas committed with unresolved Git conflict markers (lines 7-28) plus a staleoverrides:block. Exact single-variable correlation:1bc3dc7(#777)5de1f4a(#778)3787e337(#773)pnpm ≥ 8 auto-merges lockfile conflict markers in memory, so GitHub Actions'
pnpm install --frozen-lockfileexits 0 on the same file — which is why only the Vercel build surfaced it.Keeping the
overrides:block also fails in CI mode:pnpm does not honour the top-level
overridesfield, so a recorded block can never match; the last two known-good lockfiles have nooverrides:key either.Fix
Delete the 22-line conflict block. Pure deletion — no resolution changes:
adm-zipstays excluded (onnxruntime-node@1.24.3snapshot still omits it)sharp@0.35.4/@huggingface/transformers@4.2.0pins unchangeddiffvsmainis 22 deletions / 0 insertionsVerification
CI=true pnpm install --frozen-lockfile→ exit 0, noMerge conflict detected, noCONFIG_MISMATCHpnpm run build(Next.js 16.2.12 / Turbopack) → clean, 4/4 static pagespnpm run lint/typecheck/test(2576 passed) → greenRecord:
plans/138-lockfile-conflict-markers-prod-deploy-fix-2026-09-12.md📝 Summary by GitNexus
Summary
This appears to be a small build configuration cleanup centered on the package lockfile, with no graph-visible downstream reach. Review risk is low and concentrated in the lockfile content and its accompanying plan.
🟢 LOW blast radius. A build-related change to
pnpm-lock.yamlandplans/138-lockfile-conflict-markers-prod-deploy-fix-2026-09-12.md, with no detected dependents or affected execution flows.The change is confined to the repository lockfile and a planning document. Review
pnpm-lock.yamlfirst for correct lockfile structure and dependency resolution consistency, then confirm the plan document matches the scope of the lockfile update.Added by GitNexus for PR #779. Edit freely — this block is replaced on the next review, everything above it is left untouched.