tonychang04

Worker Conflict Resolver — Development agent for Claude Code

Development community

Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolution branch + PR that supersedes them.

How to install Worker Conflict Resolver

Installs to ~/.claude/agents/tonychang04-hydra-worker-conflict-resolver.md

Terminal
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.

What Worker Conflict Resolver does

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

Alternatives in Development

  • Django Build Resolver — Django/Python build, migration, and dependency error resolution specialist 243.5k ★
  • Gsd Dom Verifier — Verifies live-DOM acceptance criteria for a completed execution wave using a browser MCP server 8.8k ★
  • Better Auth Expert — Use this agent when:\n\n1. After Better Auth Implementation Changes: Any time authentication-related code is m 434 ★

Full documentation available on GitHub

View Source Repository

Related Agents

Store Steward — Development agent for Claude Code

Store Steward

Reviews schema, migration and store-size consequences of a change. Use whenever a migration, a stored field, o

Development community
Rapid Conflict Resolver — Development agent for Claude Code

Rapid Conflict Resolver

Development community
Location Resolver — Development agent for Claude Code

Location Resolver

Validates and enriches the event's "where" via web search — confirms it's a real, findable place and attaches

Development community
Git Reconciler — Development agent for Claude Code

Git Reconciler

Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diver

Development community
Calendar Conflict Checker — Development agent for Claude Code

Calendar Conflict Checker

Checks a proposed or changed event date/time against existing calendar events for conflicts, using the event-c

Development community
Merge Resolver — Development agent for Claude Code

Merge Resolver

Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict

Development community

Related Skills

Conflict Resolver — Git skill for Claude Code

Conflict Resolver

Resolve merge conflicts on develop branch

Git community
Contradiction Resolution — Documentation skill for Claude Code

Contradiction Resolution

Skill for detecting and resolving contradictions between wiki pages — compare evidence, propose resolution, li

Documentation community
Rebase PR — Git skill for Claude Code

Rebase PR

Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, r

Git community