pr-rebase

Automate git rebase for pull request branches with conflict resolution and verification.

1|Updated Jul 22, 2026
One-click install
npx skills add https://github.com/wyattjoh/skills --skill pr-rebase
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: pr-rebase
Source: https://github.com/wyattjoh/skills/tree/main/skills/pr-rebase
Command: npx skills add https://github.com/wyattjoh/skills --skill pr-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This skill solves the friction of keeping feature branches up-to-date with a base branch by automating the rebase process, conflict resolution, and verification steps that typically require manual intervention.

Core Features & Use Cases

  • Autonomous Conflict Resolution: Intelligently resolves merge conflicts by analyzing code intent from both the branch and the base, rather than just performing text-level merges.
  • Verification Gate: Ensures code integrity by running project-specific tests or typechecks before finalizing any rebase or push.
  • Safety-First Workflow: Implements force-with-lease pushing, automatic stash management, and a reset escape hatch to ensure no work is lost or overwritten.

Quick Start

Ask the agent to rebase the current branch onto the latest main branch and verify the changes.

Frequently Asked Questions about pr-rebase

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

FAQPage Schema
How do I automate git rebase for pull requests with conflict resolution?

Automating git rebase for pull requests involves integrating autonomous conflict resolution that analyzes code intent from both branches, then running verification checks like tests or typechecks before finalizing the rebase and pushing.

How does autonomous conflict resolution work during a branch rebase?

Autonomous conflict resolution works by analyzing the underlying code intent from both the feature branch and the upstream base, rather than relying solely on text-level merges, ensuring the rebase maintains branch stability.

What is the safest way to force push a rebased branch to a remote repository?

The safest way to force push a rebased branch is using force-with-lease, combined with automatic stash management and a reset escape hatch, ensuring no local or remote work is accidentally lost or overwritten.

Can I run tests or typechecks before finalizing a git rebase?

Yes, you can run tests or typechecks before finalizing a git rebase by implementing a verification gate that validates code integrity and automatically halts the pre-push process if validation checks fail.

What should I do if my automated rebase fails verification checks?

If your automated rebase fails verification checks, you should use the reset escape hatch to safely abort the process, which restores the branch to its original state and prevents pushing broken code changes.

Do I need manual intervention to keep feature branches updated with the base branch?

No, keeping feature branches updated with the base branch does not require manual intervention when using an autonomous rebase workflow that handles stash management, conflict resolution, and pre-push verification automatically.