diff options
| author | Henry J Webster <hwebs@hwebs.info> | 2026-08-03 23:38:21 -0500 |
|---|---|---|
| committer | Henry J. Webster <hwebs@hwebs.info> | 2026-08-04 16:04:51 -0500 |
| commit | 8f9fbf2f4a269eae143c9e279afc6608ce64b7d0 (patch) | |
| tree | 9e07992b8e17f4150a72aedead3f186dfafde9e5 /common | |
| parent | 6f135470d274daa3e7a7fec1cb8f36204abd90f0 (diff) | |
common: require agents to work on a branch, not main
Committing directly to main let it diverge from origin/main, so the next
pull became a rebase with a conflict on this very file. Recording the rule
where every harness will read it keeps main fast-forwardable.
Assisted-by: Claude:claude-opus-4-8
Diffstat (limited to 'common')
| -rw-r--r-- | common/AGENTS.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/AGENTS.md b/common/AGENTS.md index 24690c0..44d4a94 100644 --- a/common/AGENTS.md +++ b/common/AGENTS.md @@ -31,6 +31,9 @@ Both are NixOS, configured by the flake in `nixos-config`. ### Git +- Always work on a branch, never commit directly to `main`. Committing to + `main` lets it diverge from `origin/main` and turns the next pull into a + rebase-conflict mess; a branch keeps `main` clean to fast-forward. - Trailers: `Assisted-by: AGENT_NAME:MODEL_VERSION`. Do NOT use `Co-authored-by`. - Commit subjects: `area: imperative summary` (e.g. `profiles: extract shared sandbox profile`); the body explains why, not what. |