conflict-helper 1.0.0

Detects merge-conflict markers and walks you through resolving each one.

Plagemes 1 on Plagemes/claude-mods

Install

Claude Code
/plugin marketplace add Plagemes/claude-mods
/plugin install conflict-helper@claude-mods

Run both lines inside Claude Code.

Hooks into

  • Pane
  • Status line
  • Tool calls
  • Toasts
  • Slash commands
  • System prompt

Also in Plagemes/claude-mods

More git mods

All git mods
Repo stars
1
Repo forks
0
License
MIT
Last commit
Checked
e0e2c86,
Source on GitHub