Claude Code
Codex
Cursor
GitHub Copilot
Gemini CLIAbout this skill
Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles.
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: 770de497f7bc7eb38f54f4abd030b55b126eddadde957d2ef7cb209adb85168b
About this listing
- Category
- General
- Reported license
- Apache-2.0
- Listing language (estimated)
- English
- Review status
- Not individually reviewed
- Agent compatibility
- Atlas installation supports Claude Code, Codex, and Cursor. Skill-specific dependencies and features are checked during setup.