Cmd PR Conflict Resolver
Resolve merge conflicts systematically with context-aware 3-tier classification and escalation protocol
Install
/plugin marketplace add Olshansk/agent-skillsThe repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.
npx skills add Olshansk/agent-skills --skill cmd-pr-conflict-resolvergit clone --depth 1 https://github.com/Olshansk/agent-skills.git /tmp/agent-skills
mkdir -p ~/.claude/skills
cp -r /tmp/agent-skills/skills/cmd-pr-conflict-resolver ~/.claude/skills/cmd-pr-conflict-resolverPersonal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.
From the SKILL.md
# Resolve Merge Conflicts Your job is to resolve merge conflicts in the current branch using a structured, context-aware approach. You resolve what you can confidently, explain your reasoning for non-trivial resolutions, and escalate when the correct behavior is ambiguous. - [1. Verify State](#1-verify-state) - [2. Map All Conflicts](#2-map-all-conflicts) - [3. Build Context Per Conflict](#3-build-context-per-conflict) - [3a. Read the full file](#3a-read-the-full-file) - [3b. Trace commit history on both sides](#3b-trace-commit-history-on-both-sides) - [3c. Examine surrounding code](#3c-examine-surrounding-code) - [3d. Check cascading implications](#3d-check-cascading-implications) - [3e. Assess business logic impact](#3e-assess-business-logic-impact) - [4. Classify Each Conflict (3-Tier System)](#4-classify-each-conflict-3-tier-system) - [5. Resolve by Tier](#5-resolve-by-tier) - [Tier 1: Auto-resolve](#tier-1-auto-resolve) - [Tier 2: Resolve with type-specific guidance](#tier-2-resolve-with-type-specific-guidance) - [Tier 3: Escalate](#tier-3-escalate) - [New code escalation](#new-code-escalation) - [6. Verify and Stage](#6-verify-and-stage) - [7. Reflection and Handoff](#7-reflection-and-handoff) ## 1. Verify State Assume I already ran `git merge` and there are unresolved conflicts. - Run `git status` to confirm conflicts exist - Identify the merge target via `git rev-parse MERGE_HEAD` (or `REBASE_HEAD` / `CHERRY_PICK_HEAD` as applicable)
Details
- Skill name
cmd-pr-conflict-resolver- Repository
- Olshansk/agent-skills
- Path
skills/cmd-pr-conflict-resolver/SKILL.md- License
- MIT
- Repo updated
- 18 November 2026
FAQ
What does the Cmd PR Conflict Resolver skill do?
Resolve merge conflicts systematically with context-aware 3-tier classification and escalation protocol
How do I install the Cmd PR Conflict Resolver skill?
Claude Code plugin: /plugin marketplace add Olshansk/agent-skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.
Is Cmd PR Conflict Resolver popular?
It lives in Olshansk/agent-skills, which has 9 GitHub stars and 0 forks.
Related skills
Cmd Agent Persona Set
9Olshansk/agent-skills
Prime the agent with a behavioral persona for the conversation
Cmd Clean Code
9Olshansk/agent-skills
Improve code readability without altering functionality using idiomatic best practices
Cmd Code What
9Olshansk/agent-skills
Catch the user up on what the agent has been doing in the current session with 3-5 ultra-tight bullet points. Use when the user invokes /cmd-what, asks "what are you doing", "what did you do", "catch me up", "status", "where are we", or otherwise needs a fast situational summary of in-flight agent work.
Cmd PR Description
9Olshansk/agent-skills
Generate a PR title and description, then commit, create/update the PR on approval
Cmd PR Build Context
9Olshansk/agent-skills
Build high-signal PR context for review with diff analysis, risk assessment, and discussion questions
Cmd PR Edgecase
9Olshansk/agent-skills
Review branch changes for test gaps, logic edge cases, failure modes, and integration risks
Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.