Rebase a GitHub pull request head branch onto its base to resolve merge conflicts.
npx skills add https://github.com/paultyng/skill-issue --skill fix-pr-conflict
Please help me install this Agent Skill. Skill: fix-pr-conflict Source: https://github.com/paultyng/skill-issue/tree/main/skills/fix-pr-conflict Command: npx skills add https://github.com/paultyng/skill-issue --skill fix-pr-conflict
Merge conflicts on pull requests block code merging and require time-consuming, error-prone manual git work to resolve, especially when the base branch has new changes. This Skill automates the entire conflict resolution workflow, from rebasing the PR branch to classifying and fixing conflicts, eliminating manual effort for common cases.
Use the fix-pr-conflict skill to resolve all merge conflicts on pull request #42 and push the fixed changes to the remote repository.
High-intent search queries and answers about installing and using this skill.
To automatically resolve merge conflicts on a GitHub pull request, this Skill rebases the PR head branch onto its base branch, classifies conflicts, and pushes the fixed changes. It handles the full rebase process end-to-end without manual git commands.
Yes, you can fix PR conflicts without manually running git rebase commands. This Skill fetches the base and PR branches, performs the rebase automatically, skips generated code files, and verifies the PR is mergeable after resolution.
During automated conflict resolution, ambiguous design-related conflicts are escalated to the user. The Skill classifies conflicts as mechanical, semantic, or ambiguous, ensuring complex design decisions are not automatically overridden.
Yes, automated PR conflict resolution skips generated code files. The Skill intelligently handles conflicts by automatically bypassing generated files and delegating complex multi-file conflict analysis to subagents for semantic resolution.
The best way to handle pull request merge conflicts after the base branch is updated is using an automated rebase workflow. This approach fetches the latest base branch, rebases the PR head, resolves mechanical conflicts, and verifies mergeability.
You should not use automated rebase for merge conflict resolution when the conflicts involve ambiguous design decisions. The Skill includes guardrails to escalate these specific complex conflicts to the user rather than attempting automatic resolution.
EpiphyticRebase Git branches onto remote targets with structured conflict resolution guidance.
SamyakJhaveriPush a local feature branch and create a GitHub pull request.
2nth-aiAutomate GitHub repository, issue, pull request, and Actions workflows via APIs.
not-subhuGuide git merge conflict resolution with step-by-step instructions and automated verification.
