Skip to content

Commit 683814d

Browse files
committed
docs(release): require an up-to-date branch before a squash merge
A squash merge of a branch behind main produces a tree no pull request verified, which stops the release workflow. Say so next to the recovery steps, and run full Verify on a light-paths recovery branch.
1 parent c8ce21f commit 683814d

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

‎.github/RELEASING.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ run that leaves the release pull request unchanged does not repair it. To recove
3434
release pull request, then merge the next up-to-date pull request; Release Please opens a fresh
3535
release pull request from the verified tree.
3636

37+
A squash merge of a branch that is behind `main` breaks the release the same way, even when it
38+
applies cleanly: the merged tree is not the one Verify checked. Update the branch and let Verify
39+
finish on the new head before merging. When the recovery pull request touches only light paths,
40+
such as this file, also run Verify by `workflow_dispatch` on its branch so the release base gets
41+
every suite, not only the light checks.
42+
3743
`main` was rewritten after 0.1.0 to drop tool attribution trailers, with every tree unchanged, so
3844
the `v0.1.0` tag points at the pre-rewrite commit and is not an ancestor of `main`.
3945
`last-release-sha` in `release-please-config.json` names the rewritten 0.1.0 release commit, so

0 commit comments

Comments
 (0)