merge

Solid

Close out a feature branch or cs task worktree - run the repo's gates, merge --no-ff, re-run gates on the merged result, clean up. Invoke when the user asks to merge a branch or worktree, or to close out a finished feature.

Code & Development 30 stars 5 forks Updated 3 days ago MIT

Install

View on GitHub

Quality Score: 83/100

Stars 20%
50
Recency 20%
100
Frontmatter 20%
70
Documentation 15%
100
Issue Health 10%
50
License 10%
100
Description 5%
100

Skill Content

Merging is a ritual, not a git command: gates before, merge, gates after, cleanup only when everything is green. This skill closes out work that is already reviewed to the user's standard — it is the mechanical closer, not a quality gate or a review. ## Prerequisites - A clean tree. If `git status --porcelain` shows uncommitted changes, offer to commit them first; if the user declines, stop. Never merge over an uncommitted tree. - A context (below). If neither applies — already on the default branch with nothing to merge — say so and stop. ## Detect the context 1. **cs task worktree**: the workspace is a cs session named `<base>@<task>`, or `git rev-parse --git-dir` differs from `git rev-parse --git-common-dir` inside a cs-managed worktree session. The merge verb here is `cs <base> --merge <task>` — it fuses the session records, merges the branch, and removes the worktree. This skill wraps it with gates. 2. **Feature branch**: an ordinary checkout on a non-default branch. The target is the branch it forked from — usually the repo's default branch (`git merge-base` confirms ancestry); ask the user when the target is ambiguous. ## Discover the gates Project instructions govern absolutely. Read the project's instruction files — CLAUDE.md and anything it imports, CONTRIBUTING.md, and the README's development section — for build steps, test commands, generated artifacts, and deploy steps. A repo that generates a file from source fragments needs ...

Details

Author
hex
Repository
hex/claude-sessions
Created
8 months ago
Last Updated
3 days ago
Language
Shell
License
MIT

Integrates with

Similar Skills

Semantically similar based on skill content — not just same category