Agent SkillsAtlasBETASign in
Back to directory

Git Conflicts

Agent skill
1 skill
READMEOverview ↓

Resolve merge conflicts. Use when a merge or rebase has conflicts, a PR can't merge, "fix conflicts" appears, or you need to reconcile diverged branches. Handles file-by-file resolution with modern git tooling.

Install with
Claude CodeCodexCursorGitHub CopilotGemini CLI

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

Skill stats

Skills1CategoryGeneralStars0

About this skill

Resolve merge conflicts. Use when a merge or rebase has conflicts, a PR can't merge, "fix conflicts" appears, or you need to reconcile diverged branches. Handles file-by-file resolution with modern git tooling.

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.

Installation guide →

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

HTTP 404

About scan coverage and limitations
Original listing metadata

Original name

git-conflicts

Original description

Resolve merge conflicts. Use when a merge or rebase has conflicts, a PR can't merge, "fix conflicts" appears, or you need to reconcile diverged branches. Handles file-by-file resolution with modern git tooling.

About this listing

Category
General
Reported license
BlueOak-1.0.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.
KEEP EXPLORING

Related packs & skills

Browse category →

Finding related packs and skills…

Git Conflicts | Agent Skills Atlas