Skills
.Work. You
Rest

resolve-pr-conflict

Community

Automate PR conflict resolution for GitHub Pull Requests.

Software Engineering#pull request#github#merge conflict#rebase#force-push
Authorgetty104
Version1.0.0
Installs0

System Documentation

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>

Dependency Matrix

Required Modules

gitgithub-api

Components

scripts

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: resolve-pr-conflict
Download link: https://github.com/getty104/claude-task-worker/archive/main.zip#resolve-pr-conflict

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 620,000+ vetted skills library on demand.