How does it handle Git conflicts?

The skill performs a dry-run check before starting. If conflicts occur during the actual rebase, it identifies the affected files and provides clear instructions for resolution.

Does it verify my repository state before running?

Absolutely. It checks for a clean working directory, confirms you are in a Git repository, and ensures your branch is correctly tracking a remote.

What does the Git Rebase Expert skill do?

It automates the process of fetching remote changes and rebasing your local commits on top of them to maintain a linear and clean Git history.

Can I use this skill for interactive rebasing?

Yes, by using the --interactive flag, you can trigger an interactive session that allows you to pick, squash, or edit commits during the rebase.

Git Rebase Expert

Name: Git Rebase Expert
Author: jpoutrin

byjpoutrin

•

开发者工具

Automates Git rebasing by syncing local commits with remote updates to maintain a clean, linear project history.

The Git Rebase Expert skill streamlines complex version control workflows within Claude Code by delegating tasks to a specialized subagent. It automates the entire rebase lifecycle—from repository state verification and remote fetching to dry-run conflict detection and interactive commit management. By providing step-by-step guidance and real-time history visualization, this skill helps developers and AI agents keep feature branches up-to-date without the clutter of unnecessary merge commits, ensuring a professional and manageable codebase.

主要功能

01Step-by-step guidance for manual conflict resolution when required

02Automated repository state and remote tracking verification

038 GitHub stars

04Pre-rebase dry-run conflict detection to identify potential issues early

05Support for interactive rebase mode for granular commit control

06Detailed success summaries with updated commit history visualization

使用场景

01Syncing a feature branch with remote updates while keeping local work on top

02Cleaning up and squashing local commits before submitting a pull request

03Managing complex branch synchronization in multi-agent development environments

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jpoutrin/product-forge rebase

For use in Claude.ai and ChatGPT

Download Skill