From a7ecb815238a98108b9bedb393b5bdb5b5a303b2 Mon Sep 17 00:00:00 2001 From: Martin Othamar Date: Sat, 24 Oct 2026 21:38:36 +0000 Subject: [PATCH] docs(fork): say that GitHub marks the sync pull request merged when main moves Force-pushing a sync branch to main makes the review pull request's head main's tip, so GitHub marks it merged and gh pr close refuses it. Step 7 said to close it, which sent agents to check why it could not be closed. --- agents/dev/instructions.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/agents/dev/instructions.md b/agents/dev/instructions.md index 89740b5b4899f..886c4ea3902ee 100644 --- a/agents/dev/instructions.md +++ b/agents/dev/instructions.md @@ -44,10 +44,11 @@ upstream sync, `main` is rewritten so they fold back into the stack. Every rewri 6. `gh workflow run fork-release.yml --ref sync/` builds the apps and server archives without publishing them. Test that build as below and post the results on the pull request. 7. Once the developer approves, tag the old tip `archive/main-` and push the tag, then - `git push --force-with-lease=main: origin sync/:main` and close the pull - request. Then `gh workflow run fork-release.yml --ref main -f from_run=` publishes the - tested build as the release. If the stack changed since that run, build and test again first; - the workflow refuses a run of another commit. + `git push --force-with-lease=main: origin sync/:main`. GitHub then marks the + pull request merged, since its head is `main`'s tip, so it needs no closing; comment that the + rewrite is applied. Then `gh workflow run fork-release.yml --ref main -f from_run=` + publishes the tested build as the release. If the stack changed since that run, build and test + again first; the workflow refuses a run of another commit. 8. Move the primary checkout with `git checkout -B main origin/main`, and each branch from step 1 with `git rebase --onto origin/main archive/main- `.