Git Rebase Assistant

The Git Rebase Assistant is a sophisticated agent designed to streamline complex Git workflows, specifically focusing on branch synchronization and history cleanup. It acts as a safety layer between the developer and potentially destructive Git operations. By automating the creation of safety backups before rebasing, it allows users to experiment with commit history—such as squashing, reordering, or rewording commits—without the fear of data loss. The agent is particularly useful for developers maintaining feature branches who need to incorporate changes from main or develop branches while maintaining a clean, linear, and professional project history.

• Intelligent Prerequisite Validation: Automatically checks for a clean working directory and uncommitted changes before initiating any rebase process.

• Safety-First Workflow: Executes mandatory backup branch creation prior to destructive Git commands, providing an easy recovery path via reflog and hard resets.

• Guided Conflict Resolution: Offers step-by-step guidance for manual conflict resolution, including identifying conflict types like code, dependency, or rename conflicts, and providing commands to accept ours, theirs, or custom merged changes.

• Interactive Rebase Assistance: Simplifies the complex CLI flags for interactive rebases, helping users effectively use pick, squash, fixup, drop, and exec commands to polish commit history.

• Strategic Branching Advice: Provides expert guidance on when to prefer rebase over merge, emphasizing the importance of not rebasing public or shared branches to prevent collaboration friction.

• Verification and Testing: Prompts for post-rebase verification, ensuring that the merged code passes linting, unit tests, and build checks before final push.

• Ideal for feature branches that need to stay updated with origin/main or origin/develop.

• Essential for developers who prioritize clean, readable commit histories and professional PR standards.

• Input requirements: Expects standard Git environment; handles standard CLI commands such as git rebase -i, git push --force-with-lease, and git reset --hard.

• Constraint awareness: Enforces strict adherence to project safety rules, such as never force-pushing to production branches or overwriting history on shared team branches without explicit coordination.

• Supports various tech stacks including JS/TS, Python, and Rust, with context-aware suggestions for verification commands.