Merge a7b213d5f0 into b815410904

Merge branch 'main' into docs/branching-strategy
docs: replace branching strategy doc with trunk-based development reference
2026-02-13 14:00:15 -07:00 · 2026-02-13 14:00:13 -07:00 · 2026-02-13 11:05:58 -07:00
1 changed files with 1 additions and 1 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -73,7 +73,7 @@ After searching, use the [feature request template](https://github.com/bmad-code
 ### Target Branch
-Submit PRs to the `main` branch.
+Submit PRs to the `main` branch. We use [trunk-based development](https://trunkbaseddevelopment.com/branch-for-release/): `main` is the trunk where all work lands, and stable release branches receive only cherry-picked fixes.
 ### PR Size
Author	SHA1	Message	Date
Alex Verkhovsky	97714248c1	Merge `a7b213d5f0` into `b815410904`	2026-02-13 14:00:15 -07:00
Alex Verkhovsky	a7b213d5f0	Merge branch 'main' into docs/branching-strategy	2026-02-13 14:00:13 -07:00
Alex Verkhovsky	9a33db2042	docs: replace branching strategy doc with trunk-based development reference Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-13 11:05:58 -07:00