Menu
Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Use when auditing comments, docstrings, or embedded documentation prose in a scope — to strip bloat and rewrite cluttered-but-justified entries. Triggers on "audit comments", "clean up docstrings", "strip stale comments", "comment cleanup".
Use when the goal is to reduce code size, remove unnecessary complexity, or simplify a module without removing user-facing behavior.
Use when auditing and fixing end-to-end contracts and compatibility in a scope — HTTP/RPC APIs, events/messages, schemas, files, CLIs, libraries, configuration, database consumers, and external integrations. Triggers on "audit contracts", "API compatibility review", "schema compatibility audit", "check producer/consumer drift", "compatibility review", and "contract review". Performs an architecture-led review of semantic, backward, forward, and mixed-version compatibility; named interface classes are a minimum, never an exhaustive boundary.
Use when auditing and fixing logic bugs in a scope — off-by-one, wrong operator, inverted condition, unhandled boundary cases, unit/dimension mismatch, code that doesn't do what its name or docstring claims. Triggers on "audit correctness", "fix logic bugs", "check for off-by-one", "correctness review".
Use when auditing and fixing end-to-end data integrity in a scope — invariant violations, partial or conflicting writes, unsafe migrations/backfills, duplicate or reordered effects, precision or time corruption, stale derived stores, broken retention/deletion, and unrecoverable drift. Triggers on "audit data integrity", "review data consistency", "check migrations and invariants", "find data corruption", and related requests. Named risks are minimum, never exhaustive.
Use when auditing and fixing error handling in a scope — swallowed exceptions, defaults returned on error, optional chaining masking missing data, floating promises / missing awaits, entry points with no error boundary, resource leaks on error paths. Triggers on "audit error handling", "hunt silent failures", "fix swallowed errors", "check error boundaries", "missing await".
| 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 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:
~/.claude/skills/shared/conflict-heuristics.md~/.claude/skills/shared/migration-reconciliation.mdPre-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.
Targets that squash on merge keep no copy of the branch's commits, so merging back duplicates each one beside its squashed twin — count inflates, content does not.
Counts cannot detect this; content can. git diff origin/{target} HEAD empty → already contained, git reset --hard origin/{target} is the lossless sync. Non-empty → real divergence, merge normally. Originals stay server-side at refs/merge-requests/<iid>/head or refs/pull/<n>/head, outside the default refspec.
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>