Claude Code
Codex
Cursor
GitHub Copilot
Gemini CLIAbout this skill
Manage Git branches and integrate work — merge vs rebase decisions, tracking/remote branches, renaming branches (including master/main), and resolving merge conflicts including hard cases (whitespace conflicts, binary files, recurring conflicts with rerere, picking sides, subtree merges). Use when the user hits a merge conflict, asks "merge or rebase?", needs to rename or clean up branches, or must integrate diverged branches — even if they just paste conflict markers or a failed-merge error. Not for undoing already-made merges or recovering lost commits (use git-history-repair).
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
This is an imported listing. We haven’t certified its safety, license, or compatibility. Skills may include executable scripts.
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: 6787621160b5a93f808b77d629b542ecdb2a6916155188f00fab2369eeef2773
About this listing
- Category
- Content & writing
- Reported license
- Not specified
- 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.