Repository navigation
lanes-edit.sh: 'rebase conflict on origin/main — nothing was pushed' is printed after a write that DID land (three times on 2026-09-13/14); a retry then writes a duplicate line #32
Description
Lane: openrepotools-3 (openRepoTools-3)
Observed three times in one hour on Eagle while several lanes wrote the register concurrently (Brett Heap's "resume all" wave):
- 2026-09-13T23:59Z
append-row-status openRepoTools-3 …printedlanes-edit: rebase conflict on origin/main — nothing was pushed.— the commit e22c7b5 IS on origin/main. - 2026-09-14T00:0xZ
claim brettheap/new-workstation#28printed the same — the commit ba3304a IS on origin; the retry wrote a second CLAIMED (d08e9fb), a duplicate line (harmless under the per-lane last-line rule, but a line that should not exist). - 2026-09-14T00:29Z
append-row-status openRepoTools-3 …printed the same — d9c95bb IS on origin.
So on the path where the first push is rejected (non-fast-forward), the writer pulls, rebases and pushes successfully on a later attempt, yet the message says nothing was pushed — or the message comes from attempt 1 and attempt 2's success is not reported. Either way a caller that trusts the message retries and writes twice.
Ask: print the outcome of the LAST attempt only ("pushed origin/main (attempt N)" or the refusal), and where a rebase conflict truly aborts, leave the checkout clean and say so; a test with a sandbox origin that moves between the commit and the push (the suite already has a second clone playing the other workstation).
🤖 Generated with Claude Code
Activity
brettheap commentedon Sep 14, 2026
Lane: openrepotools-3 (openRepoTools-3)
Fourth occurrence, 2026-09-14T12:2xZ, during the lane-swap step 4(b):
append-line "PAUSED — lane openRepoTools-3, session e9ebafc3…"printedlanes-edit: rebase conflict on origin/main — nothing was pushed.while the commit 724a4fb IS on origin/main (verified withgit show origin/main:lanes/LANES.md | grep -cbefore any retry; no duplicate written). The (a)log PAUSEDwrite 74fd091 immediately before it and the (c)append-row-status3b5b0f5 immediately after both reportedpushed origin/main (attempt 1). Same shape as the three of 2026-09-13/14: the message describes an earlier attempt, not the last one.brettheap commentedon Sep 14, 2026
Lane: openrepotools-3 (openRepoTools-3)
Fifth occurrence, 2026-09-14T18:4xZ:
log OPENED opensoft/openRepoShape#161printedrebase conflict on origin/main — nothing was pushed.; verified on origin before any retry — the line was PRESENT (the message was false again; not retried). Fix in flight on this issue's PR.`commit_push`'s exit-3 table and its recovery notes stop contradictin…
Round 3: the ancestry check's own `&&`/`||` could fold a FAILED fetch…
Round 4: the ancestry check itself checked the wrong thing — a peer's…
`commit_push`'s true-conflict die stops claiming "nothing was pushed"…
The re-mode case names the skill it actually chmods, because Amendmen…
Merge origin/main (`a954435`: #50's `commit_push` conflict die and it…
Merge origin/main (a954435, #50's `commit_push` conflict die and its …
Amendment 17 tooling: a handoff is the swap under one name — `lane-ha…
Amendment 23 S3-S4 in the shell suite: every case that pinned the pul…