Back to all repositories
DA
merge-conflict-tool
by dawsonl1
A Claude Code plugin that resolves git merge, rebase, and cherry-pick conflicts using paired defender subagents to prevent bias toward 'ours'.
0stars0forks0watchers/subscribers0issues
claude-codeclaude-code-plugingitmerge-conflictsubagents
- Language
- Shell
- License
- MIT License
- Size
- 22 KB
- Created
- May 3, 2026
- Last Updated
- Jul 9, 2026
- Last Pushed
- Jul 9, 2026
Available Plugins
Loading plugins...
Evaluate before installing
- Review the source repository, recent maintenance, and license on GitHub.
- Read the marketplace manifest and plugin source files before running commands.
- Start with the smallest required permission set and validate behavior in a safe environment.