@@ -283,6 +283,35 @@ reaches `main` through `v2/main`, so there is nothing on `main` to bring back
283283except the merge commits themselves. ` v2/main ` ahead of ` main ` means a release
284284is in flight; that is the normal state.
285285
286+ ### A release that cannot be a pure merge
287+
288+ Sometimes ` v2/main ` holds work that must not ship yet, and the release has to
289+ come from a branch of its own: a release branch with cherry-picks (1.0.0
290+ shipped that way, from ` v2/release/1.0.0 ` in #5090 ), or a hotfix. The required
291+ ** Source is v2/main** check fails that PR, by design, and nobody can bypass
292+ it, admins included. The only way through is a deliberate act by a repo
293+ admin: disable the ` main: milestone merges only ` ruleset for that one merge,
294+ and turn it straight back on.
295+
296+ ``` sh
297+ RS=$( gh api repos/modelcontextprotocol/servers/rulesets \
298+ --jq ' .[] | select(.name == "main: milestone merges only") | .id' )
299+ [ -n " $RS " ] || echo " ruleset not found by name; list them and look" >&2
300+ gh api -X PUT " repos/modelcontextprotocol/servers/rulesets/$RS " -f enforcement=disabled
301+ # Merge the PR now, with "Create a merge commit". With the ruleset off,
302+ # squash and rebase are offered again; do not use them.
303+ gh api -X PUT " repos/modelcontextprotocol/servers/rulesets/$RS " -f enforcement=active
304+ gh api " repos/modelcontextprotocol/servers/rulesets/$RS " --jq .enforcement # must print "active"
305+ ```
306+
307+ - ** Only a human admin does this** , and only for a PR whose diff has been
308+ reviewed as the release. Never leave the ruleset disabled between steps.
309+ - ** Record it in the release ledger** : the PR, why it could not be a pure
310+ merge, and the times the ruleset was disabled and re-enabled.
311+ - ** Then merge the release branch back into ` v2/main ` ** through a PR of its
312+ own (#5118 did this for 1.0.0), so its commits are on ` v2/main ` and the
313+ next milestone merge is a pure one again.
314+
286315## 4. Verify the release candidate, and write the ledger
287316
288317Work from a ** dedicated worktree** with its own install, so nothing stale from
0 commit comments