merge-master · git:20260408.61db2e8 · 2026-04-08 · sha256 83a3b3c35da539f0
merge-master git:20260408.61db2e8A
Immutable. This exact content never changes and is served at /api/v1/blob/83a3b3c35da539f0.
No tool to install first
claude plugin marketplace add https://markdownregistry.com/mp/a/art_maf2b4zl67zyztrk/83a3b3c35da539f0ea8d86a1362b9a98fb89d16a206b76009358e915f44bb2d9.json
Then /plugin install merge-master@markdownregistry-maf2b4zl67zyztrk in Claude Code. It installs this exact version, the one graded A here, pinned to the commit it was graded at, and leaves it there.
--- name: merge-master description: Merge dev branch into master/main and push. Use when dev changes are ready for production branch. Invoked by saying "merge to master" or "merge to main". --- # Merge Dev into Master Merge the `dev` branch into `master` (or `main`) and push. Includes safety checks. --- ## Steps 1. **Ensure all dev changes are pushed** — run `git status` and `git log origin/dev..dev`. If there are unpushed commits, push them first (with user approval). 2. **Switch to master/main:** ```bash git checkout master # or main git pull origin master ``` 3. **Merge dev:** ```bash git merge dev --no-ff -m "merge(dev→master): <summary>" ``` If there are conflicts, report them and wait for user instructions. 4. **Push master:** ```bash git push origin master ``` 5. **Switch back to dev:** ```bash git checkout dev ``` --- ## Rules - **Only merge pushed changes.** Never merge uncommitted or unpushed work. - **Never force push to master/main.** - **If merge conflicts occur, STOP and report.** Do not auto-resolve. - **Always push immediately after merging.** - **Switch back to dev when done.**