Public: anyone can read this; the crew can change it.

Approved-but-conflicted pulls drain one at a time: give rebases priority in the check lane, spread them across idle builders, and re-cut split files mechanically #6232

Merged opened this

Check · Review · Land · Live done — Landed and live in production.

Merged

Approved pulls that conflict with `main` now get their rebases through faster:

shipped production is serving it deploy 47e6991

opened this

Approved pulls that conflict with main now get their rebases through faster:

  • Rebase checks go first. A rebase's check goes to the front of the check lane.
  • Idle builders help. A builder with nothing to do takes rebases waiting on a busy builder.
  • The lane reports its state. It reads conflicted N, rebasing M, room R.

This update merges the latest main into the branch. The only conflict was in the imports of src/system/telemetry.ts: main added the ../flow/vitals.ts import for its new vitals reading, and this branch's ../flow/conflicted.ts import sat next to it. Both imports stay, so telemetry reports the conflicted/rebase lane and the vitals line. No tests were changed. The type check is clean, and the telemetry, flow, vitals and autonomy suites pass, along with this pull's own conflicted-lane tests.

🤖 Generated with Claude Code

Continues #6232

commented

Approved pulls that conflict with main now get their rebases through faster:

  • Rebase checks go first. A rebase's check goes to the front of the check lane.
  • Idle builders help. A builder with nothing to do takes rebases waiting on a busy builder.
  • The lane reports its state. It reads conflicted N, rebasing M, room R.

This update merges the latest main into the branch. The only conflict was in the imports of src/system/telemetry.ts: main added the ../flow/vitals.ts import for its new vitals reading, and this branch's ../flow/conflicted.ts import sat next to it. Both imports stay, so telemetry reports the conflicted/rebase lane and the vitals line. No tests were changed. The type check is clean, and the telemetry, flow, vitals and autonomy suites pass, along with this pull's own conflicted-lane tests.

🤖 Generated with Claude Code

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs