skills.rest
kim-em
kim-emCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

agent-pr-recovery

Diagnose merge conflicts and rebase stale branches for agent pull requests.

112|9|Updated Feb 17, 2026
Search Tags:#git#ci/cd#code review#pull request#merge conflict#rebase
One-click install
npx skills add https://github.com/kim-em/lean-zip --skill agent-pr-recovery
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: agent-pr-recovery
Source: https://github.com/kim-em/lean-zip/tree/main/.claude/skills/agent-pr-recovery
Command: npx skills add https://github.com/kim-em/lean-zip --skill agent-pr-recovery

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill helps resolve merge conflicts on agent pull requests, rebase stale branches, and decide whether to salvage or redo a PR, streamlining the process of maintaining code integrity in collaborative agent development.

Core Features & Use Cases

  • Conflict Diagnosis: Identifies files in conflict and analyzes commit history.
  • Salvage vs. Redo Strategy: Provides clear criteria for deciding the best approach to fix a PR.
  • Manual Insertion for Spec Files: Offers a reliable pattern for resolving conflicts in critical specification files where automated methods fail.
  • Cherry-Pick Rebase Pattern: Outlines a robust method for recovering PRs on non-spec files.
  • Stale PR Detection: Helps identify and manage PRs that have become redundant.
  • Hot File Management: Tracks and provides strategies for managing files prone to frequent conflicts.

Quick Start

Use the agent-pr-recovery skill to diagnose merge conflicts on pull request number 123.

Frequently Asked Questions about agent-pr-recovery

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

FAQPage Schema
How do I resolve merge conflicts on automated agent pull requests?▼

Resolving merge conflicts on agent pull requests requires diagnosing conflicting files and analyzing commit history to strategically choose between salvaging or redoing the PR. This process automates conflict diagnosis and provides clear resolution criteria.

What is the best way to rebase stale branches in a CI/CD pipeline?▼

Rebasing stale branches in a CI/CD pipeline is best handled by detecting redundant PRs and applying a cherry-pick rebase pattern. This approach recovers non-spec files and identifies superseded pull requests for closure.

How do I fix merge conflicts in critical specification files?▼

Fixing merge conflicts in critical specification files relies on a manual insertion pattern for reliable resolution when automated methods fail. This ensures strict file integrity where standard automated merging cannot apply.

When should I salvage a conflicted pull request versus redoing it?▼

Deciding whether to salvage a conflicted pull request versus redoing it depends on specific diagnostic criteria evaluating the commit history and conflict scope. This evaluation provides clear strategic guidance on the most efficient recovery approach.

How can I manage hot files prone to frequent merge conflicts?▼

Managing hot files prone to frequent merge conflicts involves tracking these specific files and applying targeted mitigation strategies. This provides guidance on optimal merge order to maintain code integrity during rapid cadence development.

Related Skills

Explore More Software Engineering Skills→
winsorllcwinsorllc

git-health

Diagnose Git repository health by analyzing commits, branches, remotes, and configuration.

Community
Intermediate
AztecProtocolAztecProtocol
449

rebase-pr

Rebase a pull request onto its base branch and resolve conflicts with git and GitHub CLI.

Official
Intermediate
assertchrisassertchris
2

custom-conflict-resolution

Resolve Git merge conflicts file by file using a rebase strategy.

Community
Advanced
cognitedatacognitedata
5

pull-changes-resolve-conflicts

Analyze Git merge or rebase conflicts and guide resolution decisions.

Official
Intermediate