Skip to content

docs(devlog): close the cursor merge-train round log #2808

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
lidge-jun merged 1 commit into from
Aug 28, 2026
Merged

docs(devlog): close the cursor merge-train round log #2808

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
11 changes: 11 additions & 0 deletions devlog/_plan/260828_cursor_ndjson_backlog_train/050_merge_train.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,14 @@ instruction is the maintainer approval for these session-authored PRs.
(R1 lesson applied) — but the parent squash still made the old chain
CONFLICTING; wire branch cherry-picked onto dev (874f59734, 116 tests +
tsc green) and force-pushed; #2802 stayed OPEN base=dev.
- R5 (#2802): fresh CI on the rebased head fully green (0F, macos SUCCESS).
MERGED squash fbb5b0216, branch deleted.

## Train outcome: DONE

All five cursor PRs landed on dev: #2774 5511a424c -> #2803 922d53424
(successor of #2795) -> #2769 1e46430e3 -> #2801 7232a60a7 (with causal
flake fix 22c073e03) -> #2802 fbb5b0216. No open cursor PRs remain; all
train branches deleted. Squash-merge over a stacked child invalidates the
child's chain even after retargeting — cherry-pick onto dev is the reliable
restack (applied twice: R2, R4->R5).
Loading