resolve-pr-conflicts

Resolves merge conflicts across a user's open GitHub pull requests in parallel using git worktrees and sub-agents.

11|1|Updated Jul 25, 2025

Search Tags:#github #pull requests #git worktree #parallel #merge conflicts #gh cli #sub-agents

Ready to run

npx skills add https://github.com/tomzx/agents --skill resolve-pr-conflicts-tomzx

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve-pr-conflicts
Source: https://github.com/tomzx/agents/tree/main/skills/resolve-pr-conflicts
Command: npx skills add https://github.com/tomzx/agents --skill resolve-pr-conflicts-tomzx

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? When you have many open PRs blocked by merge conflicts, fixing each one by hand is slow and repetitive. This Skill scans your open PRs, detects which ones conflict, and resolves them concurrently in isolated git worktrees. ## Core Features & Use Cases - Parallel conflict resolution: Detects conflicting PRs via `gh`, prepares one worktree per PR, and fans out to one sub-agent per PR to merge the base branch, resolve conflict markers, verify, and push. - Safety rules: Aborts on ambiguous semantic conflicts and verification failures, never force-pushes, and supports a `--dry-run` mode that resolves locally without pushing. - Use Case: Run `/resolve-pr-conflicts` in a repo where you have 8 open PRs and 4 have conflicts; the skill creates 4 worktrees, launches 4 concurrent resolver sessions, and prints a summary table of pushed, needs-manual, and verify-failed verdicts. ## Quick Start Ask the agent to run /resolve-pr-conflicts to find and fix merge conflicts on your open PRs in parallel.

Frequently Asked Questions about resolve-pr-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I resolve merge conflicts on multiple GitHub pull requests at once?▼

Use the resolve-pr-conflicts skill to scan your open PRs with gh, detect which are CONFLICTING, and launch one sub-agent per PR in parallel. Each sub-agent works in its own git worktree, merges the base branch, resolves conflict markers, runs tests, and pushes the merge commit.

How to fix merge conflicts on my open PRs in parallel?▼

The skill prepares one git worktree per conflicting PR and dispatches concurrent resolver sessions, each resolving conflicts independently. It never force-pushes and aborts on ambiguous semantic conflicts, reporting a summary table of verdicts like pushed, needs-manual, or verify-failed.

Does resolve-pr-conflicts work with fork PRs?▼

Yes, it detects fork PRs via headRepository, fetches the head branch from the fork, creates a worktree from a local branch, and pushes back to the fork's head branch. The orchestrator handles fork fetch URLs and push targets automatically.

Can I test conflict resolution without pushing to GitHub?▼

Use the --dry-run flag to resolve and verify conflicts locally without pushing or commenting. Worktrees are left for review so you can inspect the resolutions before a real run.

What happens when a merge conflict is ambiguous?▼

The sub-agent runs git merge --abort and returns a needs-manual verdict, never guessing on semantic conflicts. Only unambiguous conflicts like adjacent additions or one side being a superset are auto-resolved.

What are the limitations of automated merge conflict resolution?▼

It only auto-resolves unambiguous conflicts and aborts on semantic conflicts where both sides change the same logic differently. Verification failures also trigger an abort, and PRs with UNKNOWN mergeable status are skipped.