maj0rpain

Orch Resolver — Development agent for Claude Code

Development community

The resolver of an orchestrator merge conflict - a fresh subagent that finishes one in-progress merge or rebase in the checkout it is given, or for a ticket starts the rebase onto a named parent branc.

How to install Orch Resolver

Installs to ~/.claude/agents/maj0rpain-orchestrator-orch-resolver.md

Terminal

mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/maj0rpain/orchestrator/HEAD/agents/orch-resolver.md -o ~/.claude/agents/maj0rpain-orchestrator-orch-resolver.md

Restart Claude Code, or start a new session, for it to be picked up.

What Orch Resolver does

name: orch-resolver description: The resolver of an orchestrator merge conflict - a fresh subagent that finishes one in-progress merge or rebase in the checkout it is given, or for a ticket starts the rebase onto a named parent branch itself, by reading each side's primary sources, resolving each hunk by intent, never aborting, running the repo's checks, committing, and returning a four-line report. Started by a driver session after a base sync or a ticket merge conflicts. tools: [Read, Edit

Alternatives in Development

Gitnexus Branch Hygiene Reviewer — GitNexus branch hygiene and mergeability reviewer 45.8k ★
Paypal Integration — Master PayPal payment integration including Express Checkout, IPN handling, recurring billing, and r... - wsho 31.9k ★
Polar Payments Expert — Use this agent when implementing, reviewing, or troubleshooting Polar payment integration in the Next.js appli 434 ★