Why does this skill prefer cherry-picking over standard interactive rebase?

Cherry-picking is often cleaner for complex conflicts involving global config files. It allows you to recreate the branch from the current main, effectively dropping superseded commits without navigating tedious sequential conflict markers.

Does this skill work with Git worktrees?

Yes. The skill includes specific logic to detect if a branch is already checked out in a worktree, allowing you to perform the rebase and cleanup in the correct directory without errors.

Is it safe to force-push using this skill?

The skill utilizes 'git push --force-with-lease', which is a safer alternative to a standard force-push. it ensures you don't accidentally overwrite new changes on the remote branch that you haven't fetched yet.

How does this help with secret-scan or gitleaks CI failures?

It identifies when a PR is failing due to an outdated security configuration that has already been fixed on the main branch, helping you quickly drop the old config and adopt the updated one via a rebase.

Batch PR Rebase & Conflict Resolution

Name: Batch PR Rebase & Conflict Resolution
Author: HomericIntelligence

byHomericIntelligence

•

Deployment & DevOps

Streamlines rebasing multiple pull requests against a target branch to resolve recurring merge conflicts and fix outdated CI workflows.

The Batch PR Rebase skill provides a specialized framework for developers managing several open pull requests that need synchronization with an updated main branch. It excels at resolving widespread conflicts—such as those caused by global configuration changes—and fixing CI failures triggered by outdated security scans or workflow files. By implementing a cherry-pick strategy rather than standard interactive rebasing, it effectively filters out redundant 'retrigger CI' commits, handles Git worktrees safely, and ensures a clean, production-ready commit history across your entire PR backlog.

Key Features

01Synchronize multiple pull requests against the main branch in one workflow

02Detect and manage Git worktrees to prevent branch checkout errors

03Identify and drop redundant or superseded commits to maintain a clean history

0414 GitHub stars

05Utilize cherry-pick strategies to resolve complex configuration file conflicts

06Bulk verify PR mergeability and CI status using GitHub CLI integration

Use Cases

01Cleaning up commit history by removing 'retrigger CI' and 'fixup' noise before merging

02Resolving global configuration conflicts (like .gitleaks.toml) across multiple open features

03Fixing widespread CI failures caused by updated security requirements on the main branch

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add homericintelligence/projectodyssey batch-pr-rebase

For use in Claude.ai and ChatGPT

Download Skill