You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository was archived by the owner on Nov 4, 2026. It is now read-only.
Repository navigation
Commit f7850ee
Browse filesBrowse the repository at this point in the historyBrowse files
fix(devx): retire the dead CI half of the lockfile merge driver (#7018)
changeset-release.yml configured merge.pnpm-merge but performs no local
merge, so the config could never fire. It was the last CI consumer.
.gitattributes and CONTRIBUTING.md's contributor path are measured live
and are kept; the guide section is re-pointed at what the mechanism now
is: contributor-facing with zero CI consumers.
The pin test's anti-vacuity weight moves rather than vanishing:
configuring.length > 0 was proving both that the grep matched something
and that the mechanism had a consumer. Job one moves to a control term
that must hit the same population; job two moves to .gitattributes and
CONTRIBUTING.md, the two files that are the mechanism today. The phantom
direction becomes load-bearing.
Part of #6436
Claude-Session: https://claude.ai/code/session_01GgDDqh6YnkXqsnVTCa7wHk
Co-authored-by: Claude <noreply@anthropic.com>
This configuration allows Git to automatically resolve conflicts in `pnpm-lock.yaml` by regenerating the lockfile using `pnpm install` instead of attempting a manual merge.
66
66
67
+
**This step is not optional bookkeeping — it is the only place the driver is defined.**
68
+
`.gitattributes` routes `pnpm-lock.yaml` through a driver named `pnpm-merge`, but naming a
69
+
driver does not define one, and no CI workflow defines it either (none of them performs a
70
+
merge git carries out on the runner; see the "Lockfile Merge Driver" section of
71
+
`content/docs/guide/ci-cd-pipeline.md`). Skip this and the `git merge upstream/main` below
72
+
leaves conflict markers inside `pnpm-lock.yaml` instead of regenerating it.
0 commit comments