Skip to main content
affpapa.org
RU EN
skill CX Codex

resolve-pr-conflicts — Claude Code skill: what it does & setup

Guides coding assistants through resolving pull request merge conflicts inside an isolated Git worktree without touching main branches or breaking local edits.

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓ 
npx skills add jssblck/agents --skill resolve-pr-conflicts -a claude-code
Open on GitHub

What resolve-pr-conflicts does

The skill establishes a strict procedure for rebasing or merging PR branches. It starts by reading pull request metadata, head SHAs, and repository permissions using GitHub CLI. Operations run inside a temporary git worktree, keeping your current uncommitted working directory intact.

Branch updates follow the target repository's preferred strategy. Rewriting commit history requires clear confirmation, and any force push must use --force-with-lease targeting the recorded head SHA. Pushing directly to the base branch is explicitly prohibited.

After conflict hunks are resolved, the assistant runs repository linters, formatting, and test suites on the merged tree. Without a functioning gh CLI installation, the assistant cannot inspect PR state or verify remote permissions.

What it helps with

  • update conflicting pull request branches against an updated base
  • prevent corruption of uncommitted local edits via temporary worktrees
  • run project linters and test suites before pushing resolutions
  • guard against race conditions during force pushes using --force-with-lease

Example prompts for the agent

  • Resolve the merge conflicts in PR #42 against main
  • Sync PR branch 18 with its base and run the tests
  • Update this PR with the latest changes from upstream and fix any conflicts

How to install resolve-pr-conflicts

1Skills CLI (Vercel)

npx skills add jssblck/agents --skill resolve-pr-conflicts -a claude-code

2Manually: put the files in place

~/.claude/skills/resolve-pr-conflicts/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/resolve-pr-conflicts/

Step by step, with commands for each platform: How to install skills in Claude Code: five ways

Questions about resolve-pr-conflicts

How do I install resolve-pr-conflicts in Claude Code?

Run npx skills add jssblck/agents --skill resolve-pr-conflicts -a claude-code in your terminal.

What does resolve-pr-conflicts do?

It provides safety rules and steps for resolving Git merge conflicts on pull requests. The agent works in a temporary worktree, verifies build and test passes, and updates the PR branch.

Can this skill merge the pull request into main?

No, it only updates the PR branch against its base. Direct pushes to the base branch and unauthorized final merges are prohibited.

Similar skills

All skills for Git and GitHub →
triage Matt Pocock This skill moves issues and external PRs through triage states, verification, and agent briefs. It fits maintainers managing an issue queue. 990,453installs code-review Matt Pocock Reviews changes from a chosen reference point against repository standards and the originating spec. Use it for a branch, PR, or work in progress. 789,521installs implement Matt Pocock Implements work from a specification or tickets, following a test-driven flow and ending with review and a commit. Use it when a coding task needs a defined delivery routine. 774,700installs git-guardrails-claude-code Matt Pocock This skill adds a Claude Code hook that stops risky Git commands before they run. Use it when an agent must not push or discard working-tree changes. 499,069installs setup-pre-commit Matt Pocock This skill configures pre-commit checks for a JavaScript repository, running Prettier, type checking, and tests before each commit. 489,289installs scaffold-exercises Matt Pocock This skill builds course exercise directories with sections, problems, solutions, and explainers. Use it when starting a new course section or creating exercise stubs. 480,196installs

From the same set10

merge-open-prs This skill plans and merges a fixed set of open pull requests through GitHub. Use it when several PRs must land in a controlled order. CX Codex +1 1,700installs ship-it Takes a finished change all the way to a ready pull request: commits, pushes, opens the PR and watches CI until it passes. CX Codex +1 1,700installs using-sops Guides agents to handle encrypted environment files with age identities via the pnpm secrets wrapper. CX Codex +1 1,700installs code-craft code-craft guides type boundaries, invariants, state, effects, errors, and abstraction choices. Use it when an agent is shaping a code change. CX Codex +1 1,700installs testing-craft Organizes automated checks along a strict hierarchy from static types to end-to-end runs. Useful when reviewing test suites or choosing verification levels for new code. CX Codex +1 1,200installs github-image-upload Adds screenshots or recordings to a GitHub PR, issue, or comment, then checks that each file reached the intended destination. CX Codex +1 1,200installs project-bootstrap This skill configures repository structure, checks, CI, and agent infrastructure. Use it for a new project or a repository prepared for distribution. CX Codex +1 794installs babysit Watches a GitHub pull request until its checks finish, then reports failures, missing checks, and blockers. Use it when CI needs supervised waiting. CX Codex +1 666installs

Project sponsors

Companies that keep this analytics open
Gold sponsor
Nutra.Club

Impressions, clicks and code copies — open statistics. We keep the numbers public for the same reason NeBlask itself is public. Become a sponsor