From f1253b4010b64fca361ab50a29e058888c4e88aa Mon Sep 17 00:00:00 2001 From: jyviko <2501648+jyviko@users.noreply.github.com> Date: Wed, 14 Oct 2026 07:47:51 -0400 Subject: [PATCH] AGENTS.md: main is protected; the core team merges with --admin, contributors wait for review Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01NmAttHhUZTokgPeEJia8sm --- AGENTS.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4d063cd..08f7792 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -111,9 +111,12 @@ People trust FieldCraft with their models; a crash loses their work. **This outr `git rebase -i --autosquash origin/main` (`GIT_SEQUENCE_EDITOR=true` keeps it non-interactive). A regenerated page goes into the commit that changed what it lists. 4. Rebase onto the latest `origin/main` (never merge `main` into a branch), rerun the tests of - the touched crates, push, open the PR and merge it yourself with a rebase merge, which keeps - `main` linear and every commit bisectable: `gh pr merge --rebase --delete-branch`, run as - its own command. Never squash. Then remove your worktree and delete your local branch. + the touched crates, push, open the PR and merge it with a rebase merge, which keeps `main` + linear and every commit bisectable. `main` is protected (CODEOWNERS review, linear history, + rebase merges only); the core team merges as the maintainer with + `gh pr merge --rebase --admin --delete-branch`, run as its own command. Outside + contributors' pull requests wait for the maintainer's review (CONTRIBUTING.md). Never squash. + Then remove your worktree and delete your local branch. 5. Never run the full gate locally: no `cargo xtask ci`, no `cargo clippy --workspace`, no `cargo xtask wasm` or `oracle` unless step 2 calls for it. Never watch CI. GitHub CI runs `cargo xtask ci` (fmt, assets, licences, layers, clippy -D warnings, tests, wasm), the