diff --git a/AGENTS.md b/AGENTS.md index c108bd9..1728eda 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -10,9 +10,10 @@ These rules are for people and coding agents who change this repository. `CLAUDE and its only trailer is the DCO `Signed-off-by` with that identity (`git commit -s`). No `Co-Authored-By` line for a coding agent, and no "Generated with" line in a commit message or a pull request description. - **Pull requests, landed by fast-forward.** `main` is protected; `scripts/setup-hooks.sh` installs hooks that refuse - commits and pushes on `main`. One change per pull request, one commit, rebased onto `main`; say what you ran and what - it printed. Never use GitHub's merge or squash button, which rewrites the commit's author and committer: once the - pull request's exact head is gated, a maintainer pushes that commit to `main` as a fast-forward. + commits and pushes on `main`. One change per pull request, against `staging`, one commit, rebased onto `staging`; say + what you ran and what it printed. Never use GitHub's merge or squash button, which rewrites the commit's author and + committer: once the pull request's exact head is gated, a maintainer pushes that commit to `staging` as a + fast-forward. Versions are bumped on `staging`, and `main` takes a fast-forward to it at each release. - **Independent review for shared state.** A change to shared state (task or session records, locks, the install of a return, choices) gets a review by Codex, or by a reviewer who did not write it, before or right after merge. - **Delete dead code.** Remove code, exports, config and docs that nothing uses any more; replacing code deletes the old diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca4e3ca..bf79669 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ Questions and discussion: [Discord](https://discord.gg/jBRrXmQHT). ## Pull requests -- One change per pull request. Pull requests are squash-merged into `main`. +- One change per pull request, against `staging`. `main` moves to `staging` at each release. - State what you ran and what it printed. ## Developer Certificate of Origin