Git Merge | Agent Skills Atlas

About this skill

Merge one git branch into another with context-aware conflict resolution. Use when merging a feature branch into its base, integrating two branches, reconciling a PR's branch with its target, or resolving merge conflicts thoughtfully (understanding why each side changed before resolving). Triggers on 'merge this branch', 'merge develop into...', 'resolve the conflicts on this PR', or merging two branches.

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.

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: 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: 3da306ba37265c0059ca25c43919d9b889e09c717352402b38e7f4b4e949ee9a

About scan coverage and limitations

Original listing metadata

Original name

git-merge

Original description

Merge one git branch into another with context-aware conflict resolution. Use when merging a feature branch into its base, integrating two branches, reconciling a PR's branch with its target, or resolving merge conflicts thoughtfully (understanding why each side changed before resolving). Triggers on 'merge this branch', 'merge develop into…', 'resolve the conflicts on this PR', or merging two branches.

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.