pr-conflict-resolver
Standardized, script-based resolution of git merge conflicts using defined workflows.
Install
mkdir -p .claude/skills/pr-conflict-resolver-kanade0404 && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/16505" && unzip -o skill.zip -d .claude/skills/pr-conflict-resolver-kanade0404 && rm skill.zipInstalls to .claude/skills/pr-conflict-resolver-kanade0404
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
- →Fetch PR information like number, head, base, title, URL
- →Merge base branch into head branch
- →Regenerate lock files for various ecosystems
- →Verify changes with tsc, lint, and test commands
How it works
The skill executes a series of bash scripts to fetch PR context, perform a merge, resolve conflicts by regenerating lock files or applying source conflict guidelines, and then verifies the changes. It commits the merge and pushes to the PR head branch.
Inputs & outputs
When to use pr-conflict-resolver
- →Resolve git conflicts
- →Automate PR merges
- →Fix merge errors
About pr-conflict-resolver
Executes predefined scripts to resolve merge conflicts, including context gathering, lockfile regeneration, and verification chain execution.
|
When not to use it
- →When human intervention is required for judgment calls on conflict resolution
- →When rebase is explicitly preferred over merge
- →When the task involves destructive git operations like force push
Prerequisites
Limitations
- →Does not support rebase, only merge
- →Does not ask for human input during conflict resolution
- →Escalates to human intervention if resolution is ambiguous or problematic
How it compares
This skill automates the entire conflict resolution process using a predefined sequence of scripts and strict guidelines, ensuring consistent and safe resolution without human judgment during the process, unlike 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 |
| openspec-onboard | 10 | 8mo | Review | Beginner |
| codex-cli-bridge | 9 | 11mo | Review | Intermediate |
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.
openspec-onboard
studyzy
Guided onboarding for OpenSpec - walk through a complete workflow cycle with narration and real codebase work.
codex-cli-bridge
alirezarezvani
Bridge between Claude Code and OpenAI Codex CLI - generates AGENTS.md from CLAUDE.md, provides Codex CLI execution helpers, and enables seamless interoperability between both tools
skill-sync
KyleKing
Syncs Claude Skills with other AI coding tools like Cursor, Copilot, and Codeium by creating cross-references and shared knowledge bases. Invoke when user wants to leverage skills across multiple tools or create unified AI context.
github-workflow-automation
ruvnet
Advanced GitHub Actions workflow automation with AI swarm coordination, intelligent CI/CD pipelines, and comprehensive repository management
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.