Skip to content

Trim obsolete master catch-up from branching.md #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdamSpitz merged 1 commit into from
Sep 8, 2026
Merged

Trim obsolete master catch-up from branching.md #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions workflow/branching.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Loading