skills.rest
mjun0812
mjun0812COMMUNITY
Explore all skills by this author →
Website𝕏@mjun0812GitHub

github-pr-fix

Detect and fix PR conflicts, CI failures, and review comments in a git worktree.

1|Updated Aug 24, 2026
Search Tags:#automation#code review#pull request#github#merge conflict#git worktree#ci failure
One-click install
npx skills add https://github.com/mjun0812/skills --skill github-pr-fix-mjun0812
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: github-pr-fix
Source: https://github.com/mjun0812/skills/tree/main/skills/github/github-pr-fix
Command: npx skills add https://github.com/mjun0812/skills --skill github-pr-fix-mjun0812

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve? Pull requests often accumulate multiple blockers at once: merge conflicts, failing CI checks, and unresolved review comments. Fixing each one separately is slow and error-prone, especially when the fixes must be pushed to the correct PR head branch without disturbing your current working tree. ## Core Features & Use Cases - Automatic Problem Detection: Scans a PR for merge conflicts, failed or cancelled CI checks, and unresolved review threads, then only addresses the problems that actually exist. - Isolated Worktree Fixes: Performs all edits, commits, and pushes inside a dedicated git worktree per PR, so your original working directory stays untouched. - Orchestrated Sub-Skills: Invokes conflict resolution, CI fixing, and review comment handling in the correct order, then pushes results to the PR head branch with language-matched reports. - Use Case: A teammate asks you to get PR #142 merge-ready. You run this Skill, which detects a conflict and two failing checks, resolves both in a worktree, pushes to the head branch, and prints a summary in the PR's language. ## Quick Start Ask the AI to fix all problems on PR 142, or simply say "fix everything blocking the current branch's pull request" to let it detect and resolve conflicts, CI failures, and review comments automatically.

Frequently Asked Questions about github-pr-fix

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

FAQPage Schema
How do I fix all problems on a GitHub pull request at once?▼

Run this Skill with a PR number or from the PR's branch. It detects merge conflicts, failing CI checks, and unresolved review threads, then invokes the appropriate fix for each inside a dedicated git worktree and pushes the results to the PR head branch.

How to resolve PR merge conflicts without touching my working directory?▼

The Skill creates a dedicated git worktree under the repository's .tmp directory for each PR. All conflict resolution, commits, and pushes happen inside that worktree, so your original working tree is never modified.

Can I fix a pull request from a forked repository?▼

Yes, cross-repository PRs are supported. The Skill first verifies that the authenticated user can push to the head repository, then pushes with an explicit HEAD:head-branch refspec to the fork's remote instead of the base repository.

When should I not use this PR fix skill?▼

Do not use it when you only need one type of fix, such as resolving conflicts alone or fixing CI alone. It is designed for requests to fix all PR problems together; single-purpose requests should use the dedicated individual skills.

Why does the skill check unresolved review threads instead of review state?▼

Review-level state can miss unresolved inline threads. The Skill uses a GraphQL script to count unresolved review threads directly, ensuring no pending comment is skipped before deciding whether to address review feedback.

Related Skills

Explore More Software Engineering Skills→
Soyio-idSoyio-id

create-pr

Create review-ready pull requests from feature branches via GitHub CLI.

Official
Intermediate
sky770825sky770825

merge-pr

Merge GitHub pull requests via squash with safety checks and branch cleanup.

Community
Advanced
All-The-VibesAll-The-Vibes
50

ghcp-review-resolve

Coordinate dual PR reviews and post inline comments for verified bugs.

Official
Advanced
blamechrisblamechris
4

check-pr

Automate pull request reviews by addressing CI and Copilot comments inline.

Community
Advanced