From b1adacbcb387a9ff53817f4479e569c6cd2e76ae Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Mon, 28 Sep 2026 10:18:59 +0200 Subject: [PATCH] docs: gh is required for the release-branch pull requests; ask the user to install it --- AGENTS.md | 6 ++++-- CHANGELOG.md | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4a1cb7d..699aace 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -114,8 +114,10 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine - 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 (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/X.Y.Z` + `gh pr merge --merge`; no review needed). Without + `gh` (`command -v gh`), ask the user to install it (Ubuntu: + `sudo apt install gh`, then `gh auth login`) instead of working around + it. 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 498fb05..b533d0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ one per merged pull request. - `c4ec755` **feat: --defaults --options (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts** - `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** +- `501c0ba` **docs: gh or git for merging into the release branch** +- **docs: gh is required for the release-branch pull requests; ask the user to install it** ## 2.6.0 - 2026-09-27