← Browse
conflict-helper
Plagemes ★ 1
Detects merge-conflict markers from git operations and walks you through resolving each one interactively, offering Claude assistance or quick ours/theirs checkout options. Prevents accidental reintroduction of conflict markers while conflicts exist through edit validation.
Install
> /plugin marketplace add Plagemes/claude-mods/tree/HEAD/mods/conflict-helper
> /plugin install conflict-helper
Source: https://github.com/Plagemes/claude-mods/tree/HEAD/mods/conflict-helper
What it's made of
no extra components
- Commands
- 0
- Agents
- 0
- Skills
- 0
- MCP servers
- 0
- Hooks
- 0
What it needs & plugs into
- API keys
- none
- Paid services
- none detected
- External tools
- none
- Talks to
- nothing external detected
Analyzed . Facts extracted from the plugin's files. Prose generated by claude-haiku-4-5-20251001.
Is this your plugin?
Claim it to keep the card accurate and enter the weekly contest. Requires signing in as the GitHub owner (Plagemes).