skills.rest
HomericIntelligence
HomericIntelligenceOFFICIAL
Explore all skills by this author →
GitHub

batch-pr-rebase

Rebase multiple Git pull requests against the main branch.

18|5|Updated Nov 3, 2025
Search Tags:#git#worktree#rebase#conflict resolution#ci-cd#pr-management
One-click install
npx skills add https://github.com/HomericIntelligence/ProjectOdyssey --skill batch-pr-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: batch-pr-rebase
Source: https://github.com/HomericIntelligence/ProjectOdyssey/tree/main/plugins/ci-cd/batch-pr-rebase/skills/batch-pr-rebase
Command: npx skills add https://github.com/HomericIntelligence/ProjectOdyssey --skill batch-pr-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill streamlines the process of updating multiple pull requests against the main branch, resolving conflicts and fixing CI failures caused by outdated files.

Core Features & Use Cases

  • Batch Rebasing: Updates multiple PRs simultaneously to the latest main branch.
  • Conflict Resolution: Handles common conflicts, especially those arising from shared configuration files.
  • CI Fixes: Addresses CI failures caused by outdated workflow files.
  • Worktree Support: Manages PRs that are checked out in separate worktrees.
  • Use Case: When a critical configuration file like .gitleaks.toml is updated on main, several open PRs might conflict. This Skill can rebase them all, ensuring they are mergeable and their CI checks pass.

Quick Start

Use the batch-pr-rebase skill to rebase all open PRs against the main branch.

Frequently Asked Questions about batch-pr-rebase

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

FAQPage Schema
How do I rebase multiple pull requests against the main branch at once?▼

Batch rebasing multiple pull requests involves updating them simultaneously to the latest main branch. This Skill automates that process, resolving conflicts and fixing CI failures to ensure all targeted PRs become mergeable.

Why do my open pull requests have CI failures after a shared configuration file is updated on main?▼

CI failures occur when open pull requests contain outdated shared configuration files. This Skill resolves these conflicts by rebasing the PRs against the main branch and addressing outdated workflow files.

Can I rebase pull requests that are checked out in separate git worktrees?▼

Yes, this Skill manages PRs residing in separate worktrees. It handles worktree-specific operations during the batch rebase to ensure updates apply correctly without manual intervention.

How does batch rebasing handle conflicts from shared configuration files like .gitleaks.toml?▼

Batch rebasing resolves shared configuration file conflicts by selectively cherry-picking meaningful commits. This ensures the updated configuration applies correctly while preserving individual PR changes.

What is the best way to fix outdated CI workflows across several open PRs?▼

Fixing outdated CI workflows across multiple PRs is handled by rebasing them against the main branch. This Skill addresses CI failures caused by outdated workflow files, ensuring checks pass.

Does batch rebasing cherry-pick commits to resolve git conflicts?▼

Yes, this Skill selectively cherry-picks meaningful commits during the rebase process. This ensures targeted PRs become mergeable and pass CI checks after resolving conflicts.

Related Skills

Explore More Software Engineering Skills→
dtbuchholzdtbuchholz

sync

Synchronize the current Git branch with origin/main via rebase or pull.

Community
Intermediate
DevelonautDevelonaut
3

merge-pr

Verify CI checks, detect conflicts, and squash-merge approved pull requests.

Community
Advanced
LuminairPrimeLuminairPrime

pr-guardian

Monitor and resolve GitHub PR issues via CI/CD checks and merge conflict management.

Community
Advanced
garochee33garochee33
3

pr-babysit

Monitor pull requests for CI failures, merge conflicts, and review feedback.

Community
Advanced