What happens if I encounter a merge conflict while using Claude?

The skill provides guided instructions to identify conflicted files, resolve them manually or via AI, stage the changes, and safely continue the rebase.

Can I use this skill for interactive rebasing?

Yes, it includes patterns for interactive rebasing, allowing you to pick, squash, reword, or drop commits to clean up your branch history.

What is the 'cat-base' file mentioned in the documentation?

It is a metadata file used to detect the target branch automatically, specifically optimized for workflows using the cowwoc/claude-code-cat environment.

How does this skill prevent data loss during a rebase?

It enforces a mandatory backup-before-rebase pattern, creating a timestamped branch of your current state before any history rewriting begins.

How do I undo a rebase if the result isn't what I expected?

The skill provides specific recovery commands to abort the rebase, restore your branch from the timestamped backup, or use the Git reflog to return to a known good state.

Git Rebase Workflow

Name: Git Rebase Workflow
Author: cowwoc

bycowwoc

•

Herramientas para Desarrolladores

Streamlines Git rebasing with automated backups, conflict resolution patterns, and fail-safe recovery guidance.

The Git Rebase skill provides a robust framework for performing Git rebases safely within Claude Code by enforcing a 'Backup-Verify-Cleanup' pattern. It minimizes the risks associated with rewriting history by automatically creating timestamped backup branches and offering step-by-step guidance for conflict detection and resolution. Whether you are squashing commits for a clean pull request or syncing a feature branch with the latest main branch, this skill ensures that no code is lost and that repository history remains clean and predictable.

Características Principales

01Smart base branch detection using worktree metadata

02Standardized interactive rebase support for squashing and reordering commits

032 GitHub stars

04Automatic timestamped branch backups before every rebase operation

05Step-by-step conflict detection and guided resolution workflow

06Comprehensive recovery protocols including reflog and hard reset options

Casos de Uso

01Safely resolving complex merge conflicts with a clear path to abort or restore if errors occur

02Cleaning up local commit history by squashing small commits before submitting a code review

03Updating a long-running feature branch with the latest changes from the main development line

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cowwoc/claude-code-cat git-rebase

For use in Claude.ai and ChatGPT

Download Skill