skill-git:merge

You are running /skill-git:merge. Follow these steps exactly.

Merge never overwrites anything silently. Every destructive action requires explicit user confirmation before execution.

Task Tracking

You MUST create a task for each item below and update each task's status as you progress (pending → in_progress → completed):

1. Resolve skills to merge — parse arguments or select from latest scan results
2. Load topics and show overlap — extract/cache rules, cluster into topics, display summary
3. Resolve conflicts — present each conflicting topic and record user decisions (skip if none)
4. Choose name and base folder — prompt for merged skill name and which folder to use as base
5. Synthesize merged SKILL.md — generate draft, show for approval, iterate on edits
6. Write files — write SKILL.md, copy non-SKILL.md files, update config.json, delete sources
7. Commit merged skill — pre-flight check, confirm, run git add/commit/tag

---

Prelude

!bash "${CLAUDE_PLUGIN_ROOT}/scripts/sg-prelude.sh" $ARGUMENTS

If STATUS is not ok:

• Re-examine RAW_ARGUMENTS — check if the user expressed an agent name or intent that can be semantically resolved.
• If you can determine intent, note the resolution and proceed.
• If STATUS is not_initialized and INITIALIZED_AGENTS is non-empty, suggest /skill-git:init -a <agent>.
• If STATUS is error, display REASON as a plain-language error and stop.
• If intent cannot be resolved, display a clear error and stop.

Use AGENT, GLOBAL_BASE, and SKILLS_JSON from prelude output for all subsequent steps. The skills map referred to throughout this document is the parsed content of SKILLS_JSON.

Agent name in positional position: If $ARGUMENTS contains a known agent name (claude, gemini, codex, openclaw) as a standalone positional token not preceded by -a, silently treat it as -a <agent>: override AGENT, re-read GLOBAL_BASE and SKILLS_JSON from ~/.skill-git/config.json for that agent. Do not pass it to requested_skills.