Merging Branches

Use BEFORE any git merge, rebase, or branch integration. Reads the project conventions file (CLAUDE.md or AGENTS.md) to determine merge strategy, runs pre-merge safety checks (diff name-status both sides, clean working tree, up-to-date with remote, conflict scan), requires explicit user confirmation for merge to main/master/release branches. Trigger phrases — "merge X into Y", "rebase onto", or any request implying branch integration.

KirKruglov Updated 22 repo stars

File contents

KirKruglov/OFFICINA commit b0b891bc07

Frequently asked questions

npx get-skill add kirkruglov/merging-branches