skills.rest
AztecProtocol
AztecProtocolOFFICIAL
Explore all skills by this author →
Website𝕏@aztecnetworkGitHub

rebase-pr

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

449|615|Updated Feb 20, 2023
Search Tags:#automation#git#workflow#GitHub#rebase#PR#conflicts
One-click install
npx skills add https://github.com/AztecProtocol/aztec-packages --skill rebase-pr
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-pr
Source: https://github.com/AztecProtocol/aztec-packages/tree/main/yarn-project/.claude/skills/rebase-pr
Command: npx skills add https://github.com/AztecProtocol/aztec-packages --skill rebase-pr

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill automates rebasing a pull request on its base branch and resolving conflicts that block merging.

Core Features & Use Cases

  • Automated PR rebasing: Rebase a PR onto its base branch and apply necessary fixes.
  • Conflict resolution workflow: Detect conflicts and guide resolution steps to keep PRs actionable.
  • Build verification: Validate that the rebased PR builds cleanly on the target branch.

Quick Start

Use the rebase-pr command to rebase a PR on its base branch. For example: /rebase-pr 19882

Frequently Asked Questions about rebase-pr

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

FAQPage Schema
How do I rebase a pull request and resolve merge conflicts automatically?▼

To rebase a pull request and resolve conflicts, you can automate the workflow using git and GitHub CLI to apply the base branch, detect conflicts, and guide resolution steps. This keeps the PR actionable and ready for merging.

How do I verify a build after rebasing a PR onto its base branch?▼

Verifying a build after rebasing a PR involves running build validation commands to ensure the rebased code compiles cleanly on the target branch. This automated build verification confirms the rebased pull request introduces no breaks.

Do I need GitHub CLI and git access to automate PR rebasing?▼

Yes, automating PR rebasing requires both git and GitHub CLI access to execute the necessary commands for rebasing the branch, resolving conflicts, and verifying the build status on the target repository.

What is the best way to handle GitHub PR conflicts that block merging?▼

The best way to handle GitHub PR conflicts blocking merges is to use an automated rebase workflow that detects conflicting files, applies guided resolution steps, and verifies the build to ensure a clean merge.

What are the limitations of automated conflict resolution during a git rebase?▼

Automated conflict resolution during a git rebase is limited to guiding resolution steps and applying fixes for typical PR workflows. Complex or deeply nested conflicts may still require manual intervention to ensure correct code integration.

Related Skills

Explore More Software Engineering Skills→
dyoshikawadyoshikawa
1

rebase-latest-main

Rebase a local git branch onto the latest remote main.

Community
Intermediate
nashgaonashgao
3

Merge Pull Request Command

Merge pull requests into a target branch with validation and quality gates.

Community
Advanced
lachlanchenlachlanchen
1

prepare-pr

Rebase a GitHub pull request onto main, apply review fixes, run tests, and push.

Community
Advanced
asgarovfasgarovf
23

git-essentials

Provide Git commands for branching, merging, rebasing, and conflict resolution.

Community
Intermediate