How do I install the Pr Merge Conflict Claude Code skill?

Install via the ClaudSkills desktop app (one click) or copy SKILL.md from the source repository to ~/.claude/skills/pr-merge-conflict/SKILL.md and restart Claude Code. Both flows are detailed at https://claudskills.com/install/.

Is this skill free to install?

Yes. ClaudSkills is an open registry — every skill keeps its source repository's license, and manual install via copy is free. ClaudSkills Pro ($9/mo, $79/yr, or $149 one-time) adds one-click install via the desktop app and a multi-signal Quality Score.

ClaudSkills / General / general-misc

Pr Merge Conflict

Category: General · Sub-category: general-misc · Last updated: 2026-05-21

GitHub PR URL을 인자로 받아 merge conflict(병합 충돌) 유무를 판정하고, 충돌이 없으면 즉시 종료한다. 충돌이 있으면 충돌 파일/원인 커밋을 추적해 어떤 PR/브랜치에서 유입된 변경인지 식별한 뒤, 양쪽 PR/이슈의 plans(또는 docs/plan) 문서를 찾아 의도한 구현을 모두 보존하는 형태로 충돌을 해결하고 commit+push 해서 PR이 다시 mergeable 해질 때까지 확인한다. PR 병합 충돌 해결을 요청받으면 사용한다.

From the source SKILL.md

GitHub PR의 merge conflict(병합 충돌)를 판정 -> 원인 추적 -> 계획 문서 합치기 -> 충돌 해결 구현 -> commit -> push -> 재판정 루프로 해결한다.

What this skill does

Pr Merge Conflict is a community-contributed Claude Code skill in the general-misc sub-category. It ships as a SKILL.md file that Claude Code auto-discovers under ~/.claude/skills/pr-merge-conflict/ and loads when your prompt matches the skill's trigger.

Who uses this skill

The Pr Merge Conflict Claude Code skill is built for Claude Code users and developers across all disciplines looking for general-purpose AI assistance. It's part of ClaudSkills (also referred to as Claude Skills or Claude Code Skills) — the open community-curated registry of 69,000+ SKILL.md files for Anthropic's Claude Code agent and the wider Claude ecosystem (Claude API, Claude Agent SDK).

How to install

Free

Manual install (2 steps)

mkdir -p ~/.claude/skills/pr-merge-conflict
curl -L https://claudskills.com/skills/pr-merge-conflict/SKILL.md \
  -o ~/.claude/skills/pr-merge-conflict/SKILL.md

Or just download SKILL.md directly and drop it into ~/.claude/skills/pr-merge-conflict/. Claude Code auto-discovers it on next session.

Skills live at ~/.claude/skills/pr-merge-conflict/SKILL.md on macOS/Linux, or %USERPROFILE%\.claude\skills\pr-merge-conflict\SKILL.md on Windows. See the full install guide for step-by-step instructions.

Pro

One-click install via the desktop app

The ClaudSkills desktop app installs any skill directly into ~/.claude/skills/ with one click — no terminal required. Pro starts at $9/mo or $149 lifetime.

Pro

For the full experience including quality scoring and one-click install features for each skill — upgrade to Pro.

See pricing → Download desktop app

Attribution & license

Source: https://github.com/honki12345/my-agent-skills/blob/HEAD/pr-merge-conflict/SKILL.md
Author: honki12345

More General skills

Browse all General skills in the ClaudSkills registry, or explore these other picks from the same category:

Browse all General skills → Top 100 skills

Part of ClaudSkills — the open registry for Claude Skills & Claude Code Skills. · What's New · Install guide · About · llms.txt

Part of Acreator Store — Adam Lankamer's AI tools: PerfectStudio · Ucaption · UTagger · AutoXPoster · TestYourSkills · AutomationFlows · Au Naturel

Pr Merge Conflict

From the source SKILL.md

What this skill does

Who uses this skill

How to install

Manual install (2 steps)

One-click install via the desktop app

Attribution & license

More General skills

Categories

Use cases

Popular tags

Learn

Site