Back to directory

Resolve Merge Conflicts

Agent skill
1 skill

Guide for resolving merge conflicts in Git. Use when asked to resolve merge conflicts.

Install with
Claude CodeCodexCursorGitHub CopilotGemini CLI

Supported by the Atlas install prompt. Skill-specific requirements vary.

Skill stats

Skills1CategoryGeneralStars0

About this skill

Guide for resolving merge conflicts in Git. Use when asked to resolve merge conflicts.

Quick start

  1. Copy the install prompt. Use the green button above this README.
  2. Send it to your agent. Paste it into your coding agent’s chat and send.
  3. 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: 68c4ebe304d73de21498cea1df5b6fcd1a3dc022d685edc0e0ae419ddea537ca

About scan coverage and limitations

About this listing

Category
General
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.
Resolve Merge Conflicts | Agent Skills Atlas