From 3e2da4925c7c867ff3154868e4c5837cb948d34c Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Mon, 28 Sep 2026 10:17:59 +0200 Subject: [PATCH] docs: gh or git for merging into the release branch --- AGENTS.md | 4 +++- CHANGELOG.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index f73c107..4a1cb7d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -113,7 +113,9 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine with the `bugfix/` branch into it; don't reopen an old release branch. - 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 itself once tested (with `gh`: `gh pr create --base + release/X.Y.Z` + `gh pr merge --merge`, or a plain `git merge --no-ff`; + no review 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) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2833e9..498fb05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,9 @@ one per merged pull request. - `5bf9da4` **fix: HDMI-CEC enables cec-audio-control.socket (the TV remote's volume keys); existing installs get it as an update** - `14aa7c0` **fix: the app's progress screen says "Boot into desktop", not "Boot into Boot into"** - `c4ec755` **feat: --defaults --options (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts** -- **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes** +- `eadbdda` **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes** +- `bee18b7` **docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's** +- **docs: gh or git for merging into the release branch** ## 2.6.0 - 2026-09-27