Skip to content

Distribute as a Claude Code skill#21

Merged
koppor merged 3 commits into
mainfrom
add-claude-code-skill
May 18, 2026
Merged

Distribute as a Claude Code skill#21
koppor merged 3 commits into
mainfrom
add-claude-code-skill

Conversation

@koppor

@koppor koppor commented May 18, 2026

Copy link
Copy Markdown
Owner

Summary

Make magic-merge-commit installable as a Claude Code plugin, so Claude invokes the tool automatically when it detects a squash-merge conflict.

  • Add .claude-plugin/marketplace.json + .claude-plugin/plugin.json — repo doubles as plugin and marketplace
  • Add skills/magic-merge-commit/SKILL.md — wrapper skill telling Claude when/how to run the jbang tool
  • Ship gg.cmd (gg v166) in the repo root so users can run without installing jbang; removed from .gitignore, marked executable
  • README: new "Use as a Claude Code skill" section + updated gg.cmd instructions

Install

/plugin marketplace add koppor/magic-merge-commit
/plugin install magic-merge-commit@magic-merge-commit

Notes

The skill is instructions only — it does not bundle the Java tool. Users still need jbang (or the shipped gg.cmd) and a GITHUB_TOKEN environment variable.

🤖 Generated with Claude Code

koppor and others added 3 commits May 19, 2026 00:01
Make the repository installable as a Claude Code plugin so Claude can
invoke the magic-merge-commit tool when it detects a squash-merge
conflict. Adds the marketplace and plugin manifests, the wrapper skill,
and README install instructions.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Bundle the gg.cmd launcher (gg v166) so users can run the tool without
installing jbang first. Removes gg.cmd from .gitignore and updates the
README to point at the shipped copy.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Set the executable bit so the launcher can be run directly as ./gg.cmd
on Linux/macOS, not only via `sh ./gg.cmd`.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@koppor koppor merged commit a8db222 into main May 18, 2026
2 checks passed
@koppor koppor deleted the add-claude-code-skill branch May 18, 2026 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant