skills.rest
getty104
getty104COMMUNITY
Explore all skills by this author →
Website𝕏@getty104GitHub

resolve-pr-conflict

Resolve GitHub Pull Request merge conflicts via rebase and force-push.

4|1|Updated Feb 14, 2026
Search Tags:#pull request#github#merge conflict#rebase#force-push
One-click install
npx skills add https://github.com/getty104/claude-task-worker --skill resolve-pr-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-pr-conflict
Source: https://github.com/getty104/claude-task-worker/tree/main/plugin/skills/resolve-pr-conflict
Command: npx skills add https://github.com/getty104/claude-task-worker --skill resolve-pr-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires git, github-api, and includes scripts (resource) components.

What problem does it solve?

This Skill automates the resolution of merge conflicts in GitHub Pull Requests (PRs), ensuring PRs are ready for merge without manual intervention.

Core Features & Use Cases

  • Automated Conflict Detection and Resolution: Detects conflicts between a PR and its target branch, then automatically rebases and force-pushes to resolve conflicts.
  • Integration with GitHub API: Uses GitHub API to check PR states, retrieve necessary information, and execute operations.
  • Use Case: Streamline the process of PR reviews and merges by automating conflict resolution, saving time and reducing errors.

Quick Start

Run the skill with the PR number to check and resolve conflicts: /resolve-pr-conflict <pr-number>

Frequently Asked Questions about resolve-pr-conflict

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

FAQPage Schema
How do I automatically resolve merge conflicts in a GitHub pull request?▼

Automatically resolve merge conflicts in a GitHub pull request by running a command with the PR number to rebase and force-push the branch. This checks conflict status and executes operations to ensure the PR is ready for merge.

Can I force-push to resolve PR conflicts using the GitHub API?▼

Yes, you can resolve PR conflicts by force-push using the GitHub API. The process authenticates via the GitHub API, checks PR states, executes rebases, and pushes to the remote branch.

What permissions do I need to automate rebase and force-push on a target PR branch?▼

To automate rebase and force-push on a target PR branch, you need authentication to the GitHub API and proper permissions for the target branch to execute the conflict resolution operations.

Does resolving pull request conflicts via rebase work for all GitHub PR states?▼

Resolving pull request conflicts via rebase works for PRs where conflicts exist between the PR and its target branch. The tool checks the PR state via the GitHub API before executing the rebase and force-push operations.

Why use automated rebase to fix GitHub merge conflicts instead of manual resolution?▼

Automated rebase fixes GitHub merge conflicts without manual intervention, streamlining PR reviews and merges. It saves time and reduces errors by automatically detecting conflicts and executing the required force-push operations.

What is the best way to check GitHub PR conflict status and rebase automatically?▼

The best way to check GitHub PR conflict status and rebase automatically is using a script that integrates with the GitHub API to detect conflicts, execute rebases, and force-push to the remote branch.

Related Skills

Explore More Software Engineering Skills→
JuanMS20JuanMS20

github-auth

Configure GitHub authentication for Hermes Agent using git, gh CLI, or SSH credentials.

Community
Intermediate
alexandersumeralexandersumer
1

clear-merge-blockers

Identify and resolve merge blockers in code repositories with CI/CD integration.

Community
Advanced
GolferGeekGolferGeek

GitHub Workflow

Standardize GitHub branching, pull requests, code reviews, and CI/CD pipelines.

Community
Basic
ousiassousiass

resolve-conflicts-en

Resolve GitHub pull request merge conflicts using an isolated Git worktree.

Community
Advanced