From f38e74efe7b1508b28ddd0d69d35452dce1fd3cc Mon Sep 17 00:00:00 2001 From: JustVugg Date: Sun, 12 Jul 2026 14:30:03 +0200 Subject: [PATCH] =?UTF-8?q?docs:=20adopt=20dev=20integration=20branch=20?= =?UTF-8?q?=E2=80=94=20PRs=20target=20dev,=20batched=20into=20stable=20mai?= =?UTF-8?q?n=20(ZacharyZcR's=20suggestion)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5 --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a85b860..0755056 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,17 @@ Keep changes focused and preserve Colibri's dependency-free default CPU path. +## Branches + +- **`main`** is the stable branch. It's what users clone, and it stays known-good + (engine always passes the token-exact oracle: `SNAP=./glm_tiny TF=1 ./glm 64 16 16`). +- **`dev`** is the integration branch. **Open your PR against `dev`.** Reviewed PRs + land there first; once a batch is tested and stable, the maintainer fast-forwards + it into `main`. This keeps `main` clean instead of taking every PR one at a time. + +Every PR — on either branch — is reviewed for a clean build (0 warnings), the oracle +(32/32 TF + 20/20 greedy), and its own targeted validation before merge. + ## Local checks Run the lightweight checks locally: