claudeindex
Plugin

resolve-conflicts

Surgical merge conflict resolution — understand original commit intent and apply minimum necessary changes

Installation

1

Add the marketplace

/plugin marketplace add tomitribe/claude-plugins
2

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.