From 8f9fbf2f4a269eae143c9e279afc6608ce64b7d0 Mon Sep 17 00:00:00 2001 From: Henry J Webster Date: Mon, 3 Aug 2026 23:38:21 -0500 Subject: 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 --- common/AGENTS.md | 3 +++ 1 file changed, 3 insertions(+) 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. -- cgit v1.3