Merge
Agent skills for agentic coding tools. Extremely opinionated. Updated (almost) daily.
npx -y skills add JHostalek/dotclaude --skill mergeAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 10 stars10 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts.
SKILL.md
1.6 KB, as published. Nobody here has run it
input = $ARGUMENTS
Merge target branch into current branch via git merge origin/{target} (remote-tracking ref, not local). Goal: integrate upstream changes with no orphaned symbols, no broken migration chain, and a conventional commit message that passes hooks.
Read at the point of use, not up front:
- Conflicts →
~/.claude/skills/conflict-heuristics.md - Migration files touched →
~/.claude/skills/migration-reconciliation.md
Merge Commit Message
Pre-commit hooks often reject default Merge branch 'X' into Y. Pass conventional commit explicitly:
git merge origin/{target} -m "chore: merge {target} into {current-branch}"
Same format for follow-up git commit after staging resolutions. Notable decisions → commit body.
Execution
State divergence (commits ahead/behind) and target branch before merging — do not skip to the merge without the check.
Before pushing, run the repository's configured quality gates: a conflict resolution staged after the merge started can land without ever passing a pre-commit hook, so read the repo's hook scripts and config for what actually runs rather than assuming. /merge = authorization to push; no additional confirmation needed after the plan.
<output_contract> Report: commits integrated, conflicts resolved (per-conflict decision), migration reconciliation outcome, gate results. </output_contract>