resolve-conflict
Automates the identification, resolution, and re-merging process for conflicting branches.
Install
mkdir -p .claude/skills/resolve-conflict && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/10271" && unzip -o skill.zip -d .claude/skills/resolve-conflict && rm skill.zipInstalls to .claude/skills/resolve-conflict
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.
PR マージ時に発生したコンフリクト（競合）を解消するリカバリスキル。「コンフリクトが発生した」 「マージが失敗した」「405 Pull Request is not mergeable」「競合を解消して」 「merge conflict を直して」と言った場合にトリガーする。 submit-pull-request でマージが失敗した場合に呼び出されるエラーリカバリ専用スキル。 コンフリクト箇所の特定・解消・再マージを自動化する。Key capabilities
- →Fetch latest changes
- →Identify conflict files
- →Resolve conflict markers
- →Push resolved branch
- →Re-merge pull request
How it works
It reads project settings, fetches the base branch, merges it, resolves conflict markers, and pushes the fix to re-trigger the merge.
Inputs & outputs
When to use resolve-conflict
- →Resolve merge conflicts
- →Fix failed pull requests
- →Re-merge branch after conflict
About this skill
コンフリクト解消
PR マージが 405 Pull Request is not mergeable で失敗した場合に使用する。
前提
.github/settings.json からプロジェクト設定を読み取って使用する。
手順
0. 設定読み込み
.github/settings.json を読み取り、以下の値を使用する:
github.owner— GitHub リポジトリオーナー（以降<owner>と表記）github.repo— GitHub リポジトリ名（以降<repo>と表記）github.mergeMethod— マージ方式（以降<mergeMethod>と表記）
1. ベースブランチの最新をフェッチ
cd .worktrees/<ブランチ名>
git fetch origin <ベースブランチ>
2. ベースブランチをマージ
git merge origin/<ベースブランチ>
3. コンフリクト解消
- コンフリクトしたファイルを確認:
git diff --name-only --diff-filter=U - 各ファイルのコンフリクトマーカー（
<<<<<<<,=======,>>>>>>>）を解消 - 両方の変更を統合するのが基本方針（一方を捨てない）
4. コミット＆プッシュ
git add -A
git commit -m "merge: resolve conflict with <競合ブランチ> (<prefix>-<番号>)"
git push origin <フルブランチ名>
5. PR を再マージ
mcp_io_github_git_merge_pull_request:
owner: "<owner>"
repo: "<repo>"
pullNumber: <PR番号>
merge_method: "<mergeMethod>"
When not to use it
- →Non-merge conflict errors
- →Pull requests that are not mergeable for reasons other than conflicts
Prerequisites
Limitations
- →Requires .github/settings.json configuration
How it compares
It automates the entire conflict resolution and re-merge cycle rather than requiring manual intervention.
Compared to similar skills
resolve-conflict side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| resolve-conflict (this skill) | 0 | 5mo | Review | Intermediate |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| openspec-onboard | 10 | 6mo | Review | Beginner |
| codex-cli-bridge | 9 | 9mo | Review | Intermediate |
Try saying
Example prompts that trigger this skill in your AI assistant.
More by nanikasheila
View all by nanikasheila →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.