From 2c867b024b9bd14f8f859e55d6b0b774be7d69c8 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 2 Oct 2026 09:57:58 -0700 Subject: [PATCH] quest: branch flip drops linear history on trunk Co-Authored-By: Claude Opus 5.5 --- quest/m0/branch-flip.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/quest/m0/branch-flip.md b/quest/m0/branch-flip.md index b687084433..a0f69ed80c 100644 --- a/quest/m0/branch-flip.md +++ b/quest/m0/branch-flip.md @@ -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: