docs(worktrees): the pre-squash merge-base trap — corrected, the numbers were real but the pairing was not - #149

Merged

wshallwshall merged 9 commits into

mainfrom

claude/worktrees-merge-base-trap

Aug 3, 2026

Commits on Aug 2, 2026

docs(worktrees): the pre-squash merge-base trap, and why a three-dot diff hides it
wshallwshall
committed
Merge branch 'main' into claude/worktrees-merge-base-trap
wshallwshall
authored
docs(worktrees): why merge beats rebase when every commit rewrites one block
wshallwshall
committed
docs(worktrees): drop a provenance claim I could not verify
wshallwshall
committed
docs(worktrees): mark the update-branch failure mode as inferred, not measured
wshallwshall
committed
Merge branch 'main' into claude/worktrees-merge-base-trap
wshallwshall
authored
docs(worktrees): date the armed-auto-merge bullet, and name which check does the work
wshallwshall
committed
docs(worktrees): correct the merge-base section — the numbers were real, the pairing was not
wshallwshall
committed

Commits on Aug 3, 2026

Merge branch 'main' into claude/worktrees-merge-base-trap
wshallwshall
authored