Resolve PR Conflicts | Agent Skills Atlas

About this skill

Rebase a PR branch onto the primary branch, resolve any merge conflicts, and force-push to get it ready for merge.

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: 157d9e1e9a9b1fbd1d0bd45f6e3ddc9d0b8847d9103ea79219928eaa1efc6d91

Original listing metadata

resolve-pr-conflicts

Rebase a PR branch onto the primary branch, resolve any merge conflicts, and force-push to get it ready for merge.

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.