Can I use this for interactive rebasing?

Yes, the skill supports interactive rebase operations like squashing, reordering, and editing commits while maintaining all safety protocols.

What happens if I have merge conflicts?

The skill provides a structured workflow to resolve conflicts, stage changes, and continue the rebase, ensuring you don't accidentally switch to a cherry-pick workflow.

How does this skill make rebasing safer?

It implements a 'Backup-Verify-Cleanup' pattern, creating a timestamped backup of your branch before any changes are made, allowing for instant restoration if anything goes wrong.

Does it respect my project's specific Git rules?

Yes, it automatically scans your PROJECT.md for merge policies and warns you if a rebase would conflict with your team's preferred workflow.

Git Rebase Safety & Workflow

Name: Git Rebase Safety & Workflow
Author: cowwoc

bycowwoc

•

Developer Tools

Automates safe Git rebase operations with mandatory backups, conflict recovery guidance, and history verification.

The Git Rebase Skill provides a robust framework for managing complex Git operations while minimizing the risk of data loss or history corruption. It enforces a strict 'Backup-Verify-Cleanup' pattern, automatically creating timestamped recovery points before modifying history. Beyond simple rebasing, it integrates with project-specific merge policies to ensure compliance with team workflows and offers specialized verification steps to confirm that fixups and amends are successfully applied. This skill is essential for developers who want to maintain a clean, linear commit history without the anxiety of manual conflict management.