rjmurillo

Merge Resolver — Development agent for Claude Code

Development community

Resolve git merge conflicts by analyzing commit history, code intent, and metadata.

How to install Merge Resolver

Installs to ~/.claude/agents/rjmurillo-ai-agents-merge-resolver.md

Terminal
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/rjmurillo/ai-agents/HEAD/.claude/agents/merge-resolver.md -o ~/.claude/agents/rjmurillo-ai-agents-merge-resolver.md

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

What Merge Resolver does

name: merge-resolver role: executor description: Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflicts with base branch, rebase failures occur, or merge conflicts need systematic resolution. model: sonnet argument-hint: Provide the PR number or branch name with conflicts to resolve

Merge Resolver Agent