Claude Code
Codex
Cursor
GitHub Copilot
Gemini CLIAbout this skill
GitHub PR で発生した merge conflict を自動修正するための手順とベストプラクティス。 PR コメントで @claude 経由で呼ばれた conflict 解決タスクや、ローカルでの rebase / merge conflict を解決するときに必ず参照する。チェックアウト → merge / rebase → conflict 解決 → lock ファイル再生成 → テスト → push までの一連の安全な流れを定義する。
Quick start
- Copy the install prompt. Use the green button above this README.
- Send it to your agent. Paste it into your coding agent’s chat and send.
- Review the setup. Your agent checks the skill’s instructions, requirements, and installation scope.
Review, license & listing details
Review the source before using this skill
This is an imported listing. We haven’t certified its safety, license, or compatibility. Skills may include executable scripts.
Automated security scan: Partial
Only SKILL.md was scanned. Supporting files and scripts were not checked. No safety grade has been assigned.
0 potential findings · Scanned 11/4/2026 · Scanner 0.2.1
Content SHA-256: 1a2a1aaeb837784a74e0da4d958b916fe07ffc9acc454dd1ba3be24a3360d4ba
About this listing
- Category
- General
- Reported license
- Not specified
- Listing language (estimated)
- Japanese
- Review status
- Not individually reviewed
- Agent compatibility
- Atlas installation supports Claude Code, Codex, and Cursor. Skill-specific dependencies and features are checked during setup.