Plugin

magic-merge-commit

Fix Git merge conflicts caused by a squash-merged base branch.

Installation

Add the marketplace

/plugin marketplace add koppor/magic-merge-commit

Install plugins

/plugin

Run these commands in Claude Code to add this plugin to your environment. The marketplace must be added before you can install its plugins.

Plugin Source

View Plugin Code

GitHub Repository

koppor/magic-merge-commit

From Marketplace

magic-merge-commit

View Marketplace

Author

@koppor

View GitHub Profile