pr-conflict-resolver
Safely resolve merge conflicts using a standardized, script-driven workflow.
Install
mkdir -p .claude/skills/pr-conflict-resolver && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/16499" && unzip -o skill.zip -d .claude/skills/pr-conflict-resolver && rm skill.zipInstalls to .claude/skills/pr-conflict-resolver
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
GitHub PR で発生した merge conflict を自動修正するための手順とベストプラクティス。 PR コメントで `@claude` 経由で呼ばれた conflict 解決タスクや、ローカルでの rebase / merge conflict を解決するときに必ず参照する。チェックアウト → merge / rebase → conflict 解決 → lock ファイル再生成 → テスト → push までの一連の安全な流れを定義する。Key capabilities
- →Identify PR number, head branch, and base branch
- →Checkout the head branch and pull latest changes
- →Merge the base branch into the head branch
- →Identify conflict locations by file type
- →Resolve source code conflicts by integrating changes
How it works
The skill fetches and checks out branches, merges the base into the head, identifies and resolves conflicts based on file type, regenerates lock files, runs verification checks, and then pushes the resolved branch.
Inputs & outputs
When to use pr-conflict-resolver
- →Resolve PR merge conflicts
- →Fix git rebase issues
- →Merge base to head
About pr-conflict-resolver
Automates the conflict resolution process by merging target branches, resolving conflicts, re-generating locks, and validating results without manual intervention.
|
When not to use it
- →When the user wants to manually resolve conflicts
- →When the conflict involves functional specification level contradictions
- →When the conflict involves identical test cases with differing expectations
Limitations
- →Defaults to merge over rebase
- →Cannot resolve functional specification level contradictions
- →Cannot resolve conflicts where identical test cases have differing expectations
How it compares
This skill automates the entire conflict resolution process, including specific strategies for different file types and lock file regeneration, providing a structured and safe approach compared to manual conflict resolution.
Compared to similar skills
pr-conflict-resolver side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| pr-conflict-resolver (this skill) | 0 | 3mo | Review | Advanced |
| resolve-conflicts | 81 | 10mo | Review | Intermediate |
| dependency-upgrade | 26 | 7mo | Review | Intermediate |
| git-commits | 21 | 5mo | No flags | Beginner |
Try saying
Example prompts that trigger this skill in your AI assistant.
More by kanade0404
View all by kanade0404 →You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
dependency-upgrade
wshobson
Manage major dependency version upgrades with compatibility analysis, staged rollout, and comprehensive testing. Use when upgrading framework versions, updating major dependencies, or managing breaking changes in libraries.
git-commits
bonny
Create well-structured git commits in logical chunks following best practices
git-advanced-workflows
wshobson
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
github-multi-repo
ruvnet
Multi-repository coordination, synchronization, and architecture management with AI swarm orchestration
git-workflow-enforcer
CrazyDubya
Ensures commits follow conventional commits, branch naming conventions, and PR templates. Use when creating commits, branches, or PRs, or when user mentions git workflow.