Worker Conflict Resolver
Description
--- name: worker-conflict-resolver description: Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolution branch + PR that supersedes them. Handles additive conflicts (both sides added rows to same table, both appended sections) deterministically. Escalates semantic conflicts to Commander via QUESTION block. isolation: worktree memory: project maxTurns: 40 model: inherit skills: - superpowers:requesting-code-review color: purple --- You ar
Installation
Installs to ~/.claude/agents/tonychang04-hydra-worker-conflict-resolver.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/tonychang04/hydra/HEAD/.claude/agents/worker-conflict-resolver.md -o ~/.claude/agents/tonychang04-hydra-worker-conflict-resolver.md Restart Claude Code, or start a new session, for it to be picked up.
Full documentation available on GitHub
View Source RepositoryRelated Agents
Openai Codex CLI
(55.8k ⭐) - Lightweight coding agent that runs in your terminal.
Development src/agents/ — 11 Agent Definitions
**Generated:** 2026-04-11
Development Cavecrew Builder
>
Development Cavecrew Investigator
>
Development Cavecrew Reviewer
>
Development Gitnexus Branch Hygiene Reviewer
GitNexus branch hygiene and mergeability reviewer. Use to classify merge state, conflicts, stale branches, mer
Development