Merge Resolver

Description

--- 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 <!-- vendor-portability: declared. This agent resolves conflicts in the consumer's own .agents/ evidence tree (.agents/session

Installation

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

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