Skip to content

Commit 211aa1e

Browse files
cliffhallclaude
andcommitted
docs(release): warn against Update branch on the milestone merge PR
GitHub always offers Update branch on the merge PR, since main holds commits the merge branch lacks. Clicking it adds a merge of main to the branch, so the PR is no longer a pure merge. Says so next to the merge-commit warning, with the recovery. Closes modelcontextprotocol#5092 Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: cliffhall <[email protected]>
1 parent 207fa99 commit 211aa1e

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

‎.claude/skills/release/SKILL.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,20 @@ squash writes one new commit that `v2/main` does not contain, so the two
258258
branches stop sharing history and the next milestone merge conflicts with
259259
itself.
260260

261+
⚠️ **Do not click "Update branch" on the merge PR.** GitHub always offers it
262+
here, because `main` always holds commits the merge branch lacks (its own
263+
earlier merge commits), so it does not mean the PR is out of date. Clicking it
264+
merges `main` into the merge branch: the PR gains a commit of its own, `main`
265+
receives two merge commits, and the branch head is no longer the commit the
266+
ledger names. If it was clicked, put the branch back on the commit it was cut
267+
from, then repeat the `git merge-tree` check above:
268+
269+
```sh
270+
git fetch origin
271+
git push --force-with-lease="v2/chore/$N-release-$MILESTONE" origin \
272+
"origin/v2/main:refs/heads/v2/chore/$N-release-$MILESTONE"
273+
```
274+
261275
⚠️ **Never merge `main` back into `v2/main`** to "sync" them. Everything
262276
reaches `main` through `v2/main`, so there is nothing on `main` to bring back
263277
except the merge commits themselves. `v2/main` ahead of `main` means a release

0 commit comments

Comments
 (0)