git-rebase

Name: git-rebase
Availability: InStock
Author: Sofia

Create a backup branch and guide conflict resolution during Git rebases.

Updated Aug 23, 2026

Search Tags:#git #workflow #backup #recovery #rebase #conflict-resolution

Ready to run

npx skills add https://github.com/usesofia/agents-toolkit --skill git-rebase-usesofia

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/usesofia/agents-toolkit/tree/main/skills/git-rebase
Command: npx skills add https://github.com/usesofia/agents-toolkit --skill git-rebase-usesofia

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Safely rebase branches by automatically creating backups and guiding conflict resolution to preserve history and recover from failures.

Core Features & Use Cases

Automatic backup before rebase to a timestamped branch
Conflict detection with guided resolution steps and rollback options
Backup/restore workflow that preserves backups for rollback and auditability
Safety-oriented messaging when merge policies could be violated

Quick Start

Use the git-rebase skill to rebase your feature branch onto the base branch with automatic backup and conflict verification.

Frequently Asked Questions about git-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 commits?▼

To safely rebase a feature branch, the workflow automatically creates a timestamped backup branch before applying changes, allowing you to preserve history and rollback if the rebase fails or produces unexpected results.

What is the best way to resolve Git rebase conflicts in a collaborative project?▼

Resolving Git rebase conflicts involves a guided workflow that detects conflicts, provides step-by-step resolution instructions, and offers rollback options to restore the original branch state from the automatic backup.

Do I need a clean working directory before starting a Git rebase?▼

Yes, starting a Git rebase requires a clean working directory. The safety-oriented workflow enforces this prerequisite to ensure the rebase applies correctly and the backup-verify pattern functions without interference.

How does the backup branch recovery process work after a failed rebase?▼

The backup branch recovery process retains timestamped backup branches after rebase operations, enabling you to rollback the feature branch to its original state for both failure recovery and auditability.

When should I avoid using Git rebase for integrating feature branches?▼

You should avoid Git rebase when merge policies could be violated, as the workflow provides safety-oriented messaging to prevent operations that conflict with project rules, or if you need a completely clean working directory.