claudeindex
Plugin

fix-merge-conflicts

Resolve git merge conflicts correctness-first, then prove the tree still builds. Use when a merge, rebase, cherry-pick, or stash pop leaves conflict markers, when git status shows unmerged paths, or when the user asks to fix conflicts, resolve a merge, or rebase onto the trunk and clear the conflicts.

Installation

1

Add the marketplace

/plugin marketplace add shipshitdev/skills
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.

Repository & Links

Plugin Source

View Plugin Code

GitHub Repository

shipshitdev/skills

Details & Metadata