docs: gh or git for merging into the release branch

This commit is contained in:
theupriser committed 2026-09-28 10:17:59 +02:00
1 parent 7c125e8c1c
commit 3e2da4925c
2 files changed
+6 -2

No files matched your search

+3 -1
View File
@@ -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. with the `bugfix/` branch into it; don't reopen an old release branch.
- Up to the release branch, the agent manages it: create the - Up to the release branch, the agent manages it: create the
`feature/`/`bugfix/` branches, commit, push, and merge them into 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 release branch's pull request into `main` is the user's: never commit
or merge to `main`, the user merges that one. or merge to `main`, the user merges that one.
Keep a feature/bugfix branch up to date by merging (or rebasing on) Keep a feature/bugfix branch up to date by merging (or rebasing on)
+3 -1
View File
@@ -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** - `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"** - `14aa7c0` **fix: the app's progress screen says "Boot into desktop", not "Boot into Boot into"**
- `c4ec755` **feat: --defaults --options <ids> (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts** - `c4ec755` **feat: --defaults --options <ids> (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 ## 2.6.0 - 2026-09-27