Skip to content

Commit aa7fa78

Browse files
cliffhallclaude
andcommitted
docs(release): reset to the update merge's first parent, not origin/v2/main
origin/v2/main may have moved past the commit the ledger verified; the update merge's first parent is the branch head from before the click. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: cliffhall <[email protected]>
1 parent 211aa1e commit aa7fa78

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,17 @@ here, because `main` always holds commits the merge branch lacks (its own
263263
earlier merge commits), so it does not mean the PR is out of date. Clicking it
264264
merges `main` into the merge branch: the PR gains a commit of its own, `main`
265265
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:
266+
ledger names. If it was clicked, put the branch back on its head from before
267+
the click: the update merge's **first parent**, which is the commit the ledger
268+
verified. Not `origin/v2/main`, which may have moved on to a commit nothing has
269+
verified. Then repeat the `git merge-tree` check above:
268270

269271
```sh
272+
B="v2/chore/$N-release-$MILESTONE"
270273
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"
274+
UPDATE=$(git rev-parse "origin/$B")
275+
git log -1 --format='%s' "$UPDATE" # must be "Merge branch 'main' into …"
276+
git push --force-with-lease="$B:$UPDATE" origin "$UPDATE^1:refs/heads/$B"
273277
```
274278

275279
⚠️ **Never merge `main` back into `v2/main`** to "sync" them. Everything

0 commit comments

Comments
 (0)