You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Hypothesis tested — the second jaw of the pincer is real, with one refinement
Refinement to the hypothesis:required_linear_history itself only constrains what lands on main (no merge commits may be pushed there); it never inspects a PR branch's internal history. The bite comes from its interaction with the queue's merge_method:
Linear history forbids the MERGE method → the queue must REBASE (current setting) or SQUASH.
REBASE replays the PR's non-merge commits onto main one by one and drops its merge commits — and with them every conflict resolution those merges carried.
Live test (2026-07-02 ~21:00 UTC)
I rebased origin/logan/obsidian (a30c58b, #563's head) onto origin/main (5f55e3b) in a throwaway worktree — the exact linearization a REBASE queue would attempt:
Rebasing (1/74)
CONFLICT (add/add): Merge conflict in 2026-06-18.md
error: could not apply 6e28cebf... Create 2026-06-18.md
Failure at commit 1 of 74. #563's branch carries 15 merge commits among 89 (eight Merge branch 'logan/obsidian' self-merges, plus repeated Merge branch 'main' into logan/obsidian); the resolutions live in those merges, and flattening orphans them. A REBASE-method queue can never land #563 as-is — independent of the actor-starvation jaw (#731).
Chronology anchors
**logan/obsidian** #563 has never reached the queue at all: zero added_to_merge_queue events since it opened Jun 18 (auto-merge armed 2026-06-18T18:49Z, mergeable_state: blocked ever since — open review threads gate it upstream). The linear-history wall is the next jaw after threads clear; it hasn't even been reached yet.
API note: **logan/obsidian** #563's mergeable: True is GitHub's merge-commit test (a MERGE would apply cleanly); rebase-ability is not exposed by the API, hence the local probe.
Options for landing #563 (in order of my recommendation)
Clear the open review threads first — nothing merges before that under any method.
Then open a brief SQUASH window: set the queue's merge_method to SQUASH, human-enqueue **logan/obsidian** #563 with a clear runway (no bot entries ahead, per CI Health Report — 2026-07-02 (24h review, nothing blocking main) #731 Addendum 2), revert after. Squash is linear-history-compatible and collapses the 9,006-file reorganization into one blameable commit; other entries landing during the window also just squash, which is benign.
Activity
[-][!] MERGE QUEUE [!] *JULY 1 PINCER* RESOLVED[/-][+][!] MERGE QUEUE [!] *JULY 1 PINCER* RESOLVED?[/+]loganfinney27 commentedon Jul 2, 2026
AUTOMATION still blocked by bot auth
loganfinney27 commentedon Jul 2, 2026
re-enabled linear history requirement and switched merge queue to rebase
[-][!] MERGE QUEUE [!] *JULY 1 PINCER* RESOLVED?[/-][+][!] MERGE QUEUE [!] *JULY 1 PINCER*[/+]loganfinney27 commentedon Jul 2, 2026
Hypothesis tested — the second jaw of the pincer is real, with one refinement
Refinement to the hypothesis:
required_linear_historyitself only constrains what lands on main (no merge commits may be pushed there); it never inspects a PR branch's internal history. The bite comes from its interaction with the queue'smerge_method:Live test (2026-07-02 ~21:00 UTC)
I rebased
origin/logan/obsidian(a30c58b, #563's head) ontoorigin/main(5f55e3b) in a throwaway worktree — the exact linearization a REBASE queue would attempt:Failure at commit 1 of 74. #563's branch carries 15 merge commits among 89 (eight
Merge branch 'logan/obsidian'self-merges, plus repeatedMerge branch 'main' into logan/obsidian); the resolutions live in those merges, and flattening orphans them. A REBASE-method queue can never land #563 as-is — independent of the actor-starvation jaw (#731).Chronology anchors
added_to_merge_queueevents since it opened Jun 18 (auto-merge armed 2026-06-18T18:49Z,mergeable_state: blockedever since — open review threads gate it upstream). The linear-history wall is the next jaw after threads clear; it hasn't even been reached yet.68ab72aenow permanently on main (re-enabling the rule doesn't retroactively object; it gates new pushes only).git, fix remote-URL detection #732 merged this evening under the restored REBASE + linear-history rules as three linear commits (46d468ff,d5581be9,5f55e3b4) — proving the queue handles linearizable branches fine under the current config.mergeable: Trueis GitHub's merge-commit test (a MERGE would apply cleanly); rebase-ability is not exposed by the API, hence the local probe.Options for landing #563 (in order of my recommendation)
merge_methodto SQUASH, human-enqueue **logan/obsidian** #563 with a clear runway (no bot entries ahead, per CI Health Report — 2026-07-02 (24h review, nothing blocking main) #731 Addendum 2), revert after. Squash is linear-history-compatible and collapses the 9,006-file reorganization into one blameable commit; other entries landing during the window also just squash, which is benign.Claude-Session: https://claude.ai/code/session_01SfreowpdMionR3SiGEjRBw
Generated by Claude Code
loganfinney27 commentedon Jul 2, 2026
queue method changed to squash
loganfinney27 commentedon Jul 2, 2026
limiting ref "update" blocked #736 - now added to queue
loganfinney27 commentedon Jul 3, 2026
CodeQL analysis REVERTED TO Default setup
loganfinney27 commentedon Jul 28, 2026
Current swarm directive — #563 is a special divergence case
As stated by Logan in Codex on 2026-07-28:
#563 is a special case of divergence:
mainandlogan/obsidianare not yet reconciled.Operational routing:
logan/obsidianreconciliation fight across unrelated PRs.This is a dated directive, not a permanent live-state claim.
Add GARTH-NIX-SUPERIOR-SATURDAY-TOWER.md - excerpt-anchored research …
Add GARTH-NIX-SUPERIOR-SATURDAY-TOWER.md - excerpt-anchored research …
Add GARTH-NIX-SUPERIOR-SATURDAY-TOWER.md - excerpt-anchored research …
Add GARTH-NIX-SUPERIOR-SATURDAY-TOWER.md - excerpt-anchored research …