From e2b08877d4f1f9d066eae7f8ad4588d02d00804f Mon Sep 17 00:00:00 2001 From: Adam Spitz Date: Tue, 8 Sep 2026 11:13:19 -0400 Subject: [PATCH] Drop the obsolete master catch-up from branching.md. The one-time force-align already landed; release is just scripts/promote-dev-to-master.sh. --- workflow/branching.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/workflow/branching.md b/workflow/branching.md index 076ad9ec..93cccee7 100644 --- a/workflow/branching.md +++ b/workflow/branching.md @@ -134,13 +134,6 @@ If `origin/master` has unique *file* changes (a hotfix that never went through promote. Do not open a `dev → master` GitHub PR — that creates a merge commit only on `master` and breaks the next fast-forward. -**Catch-up from the old merge-commit workflow:** if the trees already match -(`git diff --quiet origin/dev origin/master`) but `master` is not an ancestor -of `dev`, that leftover merge commit has to be dropped once. Temporarily allow -force-push on `master`, run -`scripts/promote-dev-to-master.sh --reset-master-to-dev`, then re-run -`scripts/protect-branches.sh` so force-push is off again. - If your local `master` got messy while experimenting, reset it to the remote instead of pushing it: