steamify-cachyos-dev/.claude/skills/steamify-branch-cleanup/SKILL.md

name, description

name	description
steamify-branch-cleanup	Clean up git branches in steamify-cachyos (and sibling steamify repos) following the release-branch flow. Use when the user asks to clean up / prune branches.

Steamify branch cleanup

Rules:

• ALWAYS keep main. A release/X.Y.Z branch is deleted (local and remote) once its release is published and its tip is contained in a tag or in main (the user said so on 2026-10-02: the tags keep the history). Check each one first (git tag --contains <tip>, git merge-base --is-ancestor): a release branch with a commit that is in no tag and not in main (release/2.9.2: a docs commit) is kept and reported. The open release's branch stays until its PR is merged.
• Delete feature/* and bugfix/* branches (local and remote) only when merged into origin/main or the current origin/release/* branch.
• Delete local branches whose remote is gone ([origin/...: gone]) only if they are feature/* or bugfix/*; local stale release/* branches are kept unless the user says otherwise.
• Never touch unmerged branches; list them and report instead.
• Never commit or merge to main.

Merging a feature/bugfix PR yourself (into a release branch, or master in the ISO repo): delete the branch at once, remote and local (gh pr merge N --merge --delete-branch, then git branch -D, git fetch --prune); the user asked for this on 2026-09-29. Release branches are deleted after their release (see the rules above; the tag keeps the history). Unmerged old branches (feat/vram-booster, refactor/qml-screens, backup/*) are reported, not touched. The GitHub-side release delete <tag> --cleanup-tag is how test ISO releases go.

Steps:

1. git fetch --all --tags --prune
2. git checkout main && git merge --ff-only origin/main
3. List candidates: git branch -vv, git branch -r --merged origin/main, and same for the current release branch.
4. Delete local (git branch -d) and remote (git push origin --delete <b>) feature/bugfix branches per the rules above.
5. Report what was deleted and what was kept.

Note: remote deletions may be blocked by the auto-mode classifier; if so, stop and let the user approve a permission rule or run it via !.