メニュー
Absorb one or more feature branches into the base branch. Recommends merge vs rebase per branch. Designed for lazy absorption of parallel Claude session branches.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| name | merge |
| description | Absorb one or more feature branches into the base branch. Recommends merge vs rebase per branch. Designed for lazy absorption of parallel Claude session branches. |
| tags | ["merge","git","pre-merge"] |
Absorb feature branches into the base branch. Handles single or multiple branches, recommends strategy per branch.
Gather state (parallel):
git branch --show-current — identify current branchgit status — ensure working tree is cleangit branch -v — list all local branches with last commitgit log --oneline --graph --all --decorate -20 — visual overviewIdentify target branches:
For each candidate branch, gather intel (parallel per branch):
git log --oneline {base}..{branch} — commits aheadgit log --oneline {branch}..{base} — commits behind (base moved since branch)git diff --stat {base}...{branch} — files changedgit log --oneline {base}..{branch} | wc -l — commit countRecommend strategy per branch:
| Condition | Strategy | Why |
|---|---|---|
| 1 commit, no conflicts | Rebase + fast-forward | Clean linear history |
| 2-3 commits, single logical change | Rebase + fast-forward | Still clean enough |
| Multi-commit, preserving context matters | Merge --no-ff | Keeps branch grouping visible |
| Branch has been pushed/shared | Merge --no-ff | Don't rewrite shared history |
| Conflicts detected | Merge (rebase conflicts are harder to resolve) | Safer conflict resolution |
Present recommendations as a table. Let user override any.
Confirm with user:
Execute sequentially (order matters — earlier merges can cause conflicts in later ones): For each branch in confirmed order:
If rebase strategy:
git rebase {base} {branch}
git checkout {base}
git merge {branch} --ff-only
If merge strategy:
git checkout {base}
git merge {branch} --no-ff
On conflict:
git diff --name-only --diff-filter=UPost-absorption per branch:
git log --oneline -3 to show resultgit branch -d {branch})Summary:
git log --oneline --graph -10cd — working directory is already correct.Cross-reference project docs for drift, stale references, and contradictions. Outputs timestamped report. Universal baseline — works with any docs/ structure from sp-bootstrap.
Stage and commit current session changes with a proper conventional commit message. No push.
Use when a non-trivial decision needs deep deliberation grounded in the project's full canonical context. Loads all canonical project docs, states the frame (target user, binding constraints, what's already decided), then enters open conversation with the user. This is a context-loading skill, not an output-producing one.
Scan frontend code for domain logic that violates Frontend=Intent, Backend=Logic. Outputs structured violation report. Universal baseline — extend with project-specific patterns.
Use when caller wants to observe how a stranger encounters a flow, artifact, or sandbox — triggers like "simulate a user journey", "test our onboarding / checkout / signup", "will my ICP convert", "how does a cold reader experience this README", "first-time user test", "cognitive walkthrough", or any request to evaluate friction from a non-builder perspective.
Scan docs/superpowers/ for active specs and plans. Show status table with cycle stage, progress, and blockers. Suggest what to tackle next. Works in any repo with the superpowers pipeline.