fixme-rebase

Rebase a feature branch onto its base with automated safety checks and backups.

Updated Feb 18, 2026

Search Tags:#git #verification #safety #backup #rebase #conflict-resolution #branch-management

Ready to run

npx skills add https://github.com/denis-pingin/fixme --skill fixme-rebase

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: fixme-rebase
Source: https://github.com/denis-pingin/fixme/tree/main/.claude/skills/fixme-rebase
Command: npx skills add https://github.com/denis-pingin/fixme --skill fixme-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

Safely rebases the current feature branch onto its base branch with built-in safety checks, automatic backups, and rigorous verification to prevent data loss and lost work.

Core Features & Use Cases

Pre-flight safety checks to detect protected branches, in-progress operations, and uncommitted changes.
Dynamic base-branch detection from PR targets, remote defaults, and local history, followed by a safe refresh of both base and current branches.
Optional content-walk and fork-point detection to minimize replays when upstream histories were rewritten or when a squash-merge happened.
Automatic backup creation and clear user guidance when potential conflicts are detected.

Quick Start

Run the fixme-rebase command to safely rebase your current branch onto its base with automatic safety checks and verification.

Frequently Asked Questions about fixme-rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I safely rebase a feature branch without losing uncommitted changes?▼

Safe branch rebasing uses pre-flight validations to detect uncommitted changes and in-progress operations, automatically stashing work before rebasing to prevent data loss. Automatic backups are created if conflicts are detected.

What is the best way to rebase a branch after an upstream history rewrite?▼

The best way to rebase after an upstream history rewrite is using content-walk and fork-point detection to minimize replays. This method reconciles BASE and HEAD references accurately, preventing duplicate commits after squash-merges.

How does automated base branch detection work for git rebases?▼

Automated base branch detection for git rebases identifies the target base dynamically by checking PR targets, remote defaults, and local history. It safely refreshes both the base and current branches before applying changes.

Can I run an automated rebase if my local repository has an in-progress git operation?▼

You cannot run an automated rebase with an in-progress git operation because pre-flight validations detect active operations and halt the process. You must complete or abort the existing operation before initiating a safe branch rebase.

How do I handle conflict resolution when rebasing onto a protected branch?▼

Conflict resolution when rebasing halts automatically if pre-flight checks detect a protected branch. For other branches, automatic backups are created and clear user guidance is provided to manage conflicts non-destructively.