# dawsonl1/merge-conflict-tool

A Claude Code plugin that resolves git merge, rebase, and cherry-pick conflicts using paired defender subagents to prevent bias toward 'ours'.

## Repository

- [Catalog detail page](https://awesomeclaudeplugins.com/dawsonl1/merge-conflict-tool)
- [GitHub repository](https://github.com/dawsonl1/merge-conflict-tool)
- Stars: 0
- Forks: 0
- 1 plugin entries are reported.

## Catalog provenance

- Publication state: indexable
- Quality note: Canonical repository has a description and validated plugin count.
- Catalog snapshot: Aug 31, 2026
- Repository metadata source: public GitHub API when available

## Installation

When this repository exposes a Claude Code marketplace, add it with:

```bash
/plugin marketplace add dawsonl1/merge-conflict-tool
```