Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts.
Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts.
npx skills add https://github.com/JHostalek/dotclaude --skill merge复制此命令并粘贴到 Claude Code 中以安装该技能
Use when the user asks to commit, create a git commit, checkpoint changes, save work to git, or write a commit message.
Use after making changes to run the project's quality gates and report pass or fail for each relevant check.
Generate a centralized, high-altitude mental-model of a codebase as a few whole-system "lens" documents (overview, capabilities, dataflow, codemap, domain) — read instead of the code to understand what a system does. Use when the user wants architecture docs, a codebase overview/mental model, onboarding docs, or to (re)generate `codemap/`. Triggers: "build codemap", "generate architecture docs", "refresh the codemap", "document this codebase".
Use when a task is multi-step, ambiguous, or high-impact and you need an executable implementation plan before editing code.
Use when the user asks to create or update a pull request for the current branch.
Use when rewriting an existing skill so Opus 4.8 (or any frontier reasoning model) executes it with better judgment, less scaffolding, and tighter calibration. Do NOT trigger for new skills from scratch (use skill-creator) or for prompt artifacts (use prompt).
| name | merge |
| description | Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts. |
| argument-hint | [target-branch] (defaults to master/main) |
input = $ARGUMENTS
Merge a target branch into the current feature branch.
Use git merge origin/{target} (remote-tracking ref, not local branch).
Partial survival: when a resolution keeps usage of a symbol, verify the declaration and import also survived. Grep the resolved file for every feature-side symbol before continuing.
!cat ~/.claude/skills/migration-reconciliation.md
Pre-commit hooks often reject the default Merge branch 'X' into Y. Use conventional commit format and pass it explicitly:
git merge origin/{target} -m "chore: merge {target} into {current-branch}"
Same format for follow-up git commit after staging conflict resolutions. Notable decisions go in the commit body.
Announce the merge plan before starting — divergence (commits ahead/behind), target branch. /merge is intent to push; no confirmation after the plan. Gate before pushing.
Report: commits integrated, conflicts resolved, migration reconciliation, gate results.