Skip to content

quest: branch flip drops linear history on trunk #4730

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
kixelated merged 1 commit into from
Oct 2, 2026
Merged

quest: branch flip drops linear history on trunk #4730

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
13 changes: 5 additions & 8 deletions quest/m0/branch-flip.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,11 @@ Decided (2026-10-02):
breaks), the rules describe trunk, `release`, and backports, and
`dev`-only process quests are deleted.
- ✅ One quest, m0, right after dev-sync lands.

Open:

- Trunk's linear-history rule rejects the back-merge's merge commit.
Recommended: drop linear history from trunk's ruleset, so the back-merge
lands as a merge commit and advances the merge base; ordinary PRs still
squash. Rejected: squash-merging the back-merge, which leaves the base at
the last cut, so a second publish before the next cut conflicts.
- ✅ Trunk's ruleset drops linear history, so the back-merge lands as a merge
commit and advances the merge base; ordinary PRs still squash. Rejected:
squash-merging the back-merge, which leaves the base at the last cut, so a
second publish before the next cut conflicts; and a ruleset bypass for the
workflow token.

Sequence:

Expand Down
Loading