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.
How to install merge-resolver?
rjmurillo/ai-agents/merge-resolver
$curl -o .claude/agents/merge-resolver.md https://raw.githubusercontent.com/rjmurillo/ai-agents/HEAD/.claude/agents/merge-resolver.mdInstalls into the current project.
›Prefer a prompt? Paste this to your agent
Install merge-resolver by running `curl -o .claude/agents/merge-resolver.md https://raw.githubusercontent.com/rjmurillo/ai-agents/HEAD/.claude/agents/merge-resolver.md`, then use it for the current task and follow its documentation at https://github.com/rjmurillo/ai-agents.
Related
6 picksType
- debuggerRoot-cause analysis, regression isolation, stack trace analysis, build/compilation error resolutionJul 2026
- exploreCodebase search specialist for finding files and code patternsJul 2026
- tracerEvidence-driven causal tracing with competing hypotheses, evidence for/against, uncertainty tracking, and next-probe recommendationsJul 2026
- performance-analystThe Performance Analyst profiles game performance, identifies bottlenecks, recommends optimizations, and tracks performance metrics over time. Use this agent for performance profiling, memory…May 2026
- debuggerUse this agent when encountering errors, test failures, unexpected behavior, or any issues that require root cause analysis. The agent should be invoked proactively whenever debugging is needed.Jul 2026
- explorerRead-only code exploration sub-agent. Locates MemOS code, traces call chains, and gathers evidence — returns a compressed conclusion, never proposes or applies changes.Jul 2026
