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.
EnglishUse for scaffolding, new projects, package setup, quality tooling, CI, and repo structure.
EnglishUse when checking if a file is covered by rules, testing path patterns, verifying rules coverage, or when the user asks about rule applicability. 任意のファイルパスが .claude/rules/ の paths 条件に該当するかを判定し、ファイル操作前の確認、paths 条件のテスト、rules 適用範囲の確認に使う。Determines if a file path matches any paths conditions in .claude/rules/.
JapaneseUse when user asks about KV, R2, D1, Durable Objects, Queues, Hyperdrive, storage, database, or data persistence on Cloudflare. Also use when user says KV ストア, R2 バケット, D1 データベース, Durable Objects, キュー, ストレージ.
Japanese
AGENT SKILLS ATLASIncludes Resolve Conflicts, Scaffolding, and other workflows.
Claude Code
Codex
Cursor
GitHub Copilot
Gemini CLISupported by the Atlas install prompt. Skill-specific requirements vary.
Pack stats
What’s included
Resolve Conflicts
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.
Scaffolding
Use for scaffolding, new projects, package setup, quality tooling, CI, and repo structure.
File Path Matcher
Use when checking if a file is covered by rules, testing path patterns, verifying rules coverage, or when the user asks about rule applicability. 任意のファイルパスが .claude/rules/ の paths 条件に該当するかを判定し、ファイル操作前の確認、paths 条件のテスト、rules 適用範囲の確認に使う。Determines if a file path matches any paths conditions in .claude/rules/.
Storage Services
Use when user asks about KV, R2, D1, Durable Objects, Queues, Hyperdrive, storage, database, or data persistence on Cloudflare. Also use when user says KV ストア, R2 バケット, D1 データベース, Durable Objects, キュー, ストレージ. Cloudflare ストレージサービスの完全ガイドで、KV、R2、D1、Durable Objects、Queues、Hyperdrive の使い方、設定、ベストプラクティスを提供する。
Quick start
- Choose your skills. Select individual skills above, or choose the entire pack.
- Copy the install prompt. Use Copy install prompt above the list.
- Send it to your agent. Paste into your coding agent’s chat. Your agent reviews the source and guides the setup.
Try it with your agent
After installation, start with a request like:
Use the Resolve Conflicts skill to help with my task.
Ask me for the context you need before getting started.Requirements & license
- A coding agent that can access your project files and install skills.
- Your agent checks each skill’s instructions, dependencies, and permissions during setup.
- Reported license for the skills shown: MIT. The author’s terms apply.