docs(AGENTS): do not push main to gh/main
Work reaches GitHub as a branch and a PR. The orchestrator still merges agent branches into its local main to integrate and run the gates -- that is how conflicts get found early -- but the push is a branch push. Written because it drifted: 27 commits across six agent branches, including a new crate, a new protocol type and a type moving between crates, went straight to main unreviewed while this file already said not to. Records the review-only PR as the cheap repair, and that rewinding the default branch to fake a mergeable PR is not worth it with other collaborators on the repo. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EoW5BB87ZZdm96SvBTWawH
This commit is contained in:
@@ -135,6 +135,23 @@ and watch the check fail.
|
||||
|
||||
### Shipping a wave
|
||||
|
||||
**Do not push `main` to `gh/main`.** Work reaches GitHub as a branch and a pull
|
||||
request, and lands on `main` by being merged there. The orchestrator still
|
||||
merges agent branches into its *local* `main` to integrate and run the gates —
|
||||
that is how conflicts get found early — but the push is a branch push, not a
|
||||
`main` push. `origin` and `gitea` are mirrors and take `main` directly.
|
||||
|
||||
This is easy to drift out of, because merging locally and pushing feels like
|
||||
finishing. It happened in this repo: 27 commits across six agent branches —
|
||||
including a new crate, a new protocol type, and a type moving between crates —
|
||||
went straight to `main` unreviewed, while `AGENTS.md` already said not to. If
|
||||
you notice a batch has bypassed the loop, the cheap repair is a **review-only
|
||||
PR**: base a branch at the last PR merge, open a PR with `main` as the head, let
|
||||
Copilot review the diff, and land the findings as an ordinary PR afterwards. It
|
||||
cannot be merged — the commits are already in — so close it once its findings
|
||||
are filed or fixed. Rewinding the default branch to fake a mergeable PR is not
|
||||
worth it on a repo with other collaborators.
|
||||
|
||||
One PR per wave, built by a **dedicated PR agent in its own worktree**, so waves
|
||||
pipeline against it: the next wave runs while the PR absorbs review fixes.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user