From 7c125e8c1c8097106b60b57d3820da210ad84997 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Mon, 28 Sep 2026 10:17:41 +0200 Subject: [PATCH] docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's --- AGENTS.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index f12a7e0..f73c107 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -111,7 +111,11 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine request **into `main`**. Merging it publishes the release (below). - A fix for a released version: a new `release/X.Y.Z+1` from `main`, with the `bugfix/` branch into it; don't reopen an old release branch. - - Never commit to `main` directly; the user merges the pull requests. + - Up to the release branch, the agent manages it: create the + `feature/`/`bugfix/` branches, commit, push, and merge them into the + release branch itself once tested (no pull request needed). Only the + release branch's pull request into `main` is the user's: never commit + or merge to `main`, the user merges that one. Keep a feature/bugfix branch up to date by merging (or rebasing on) its release branch, the release branch by merging `main` when that moved.