Git:conflicts | Agent Skills Atlas

About this skill

Resolving git merge conflicts. Use when rebasing, merging, or cherry-picking results in conflicts.

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: cbd236d7a3a157e916bd7edb9401d26b304fe9429e615d32838a93f729d1c607

Original listing metadata

git:conflicts

Resolving git merge conflicts. Use when rebasing, merging, or cherry-picking results in conflicts.

Category: General
Reported license: MIT
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.