rebase-assistant

Rebase the current branch onto a target branch with conflict triage guidance.

130|15|Updated Dec 14, 2025

Search Tags:#git #workflow #safety #rebase #triage #branch-management #conflicts

Ready to run

npx skills add https://github.com/jMerta/codex-skills --skill rebase-assistant

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: rebase-assistant
Source: https://github.com/jMerta/codex-skills/tree/main/rebase-assistant
Command: npx skills add https://github.com/jMerta/codex-skills --skill rebase-assistant

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase operations can be error-prone and disruptive. This Skill provides a safe, step-by-step workflow to rebase the current branch onto a target branch, with built-in guidance for conflict triage and resolution.

Core Features & Use Cases

Safe, step-by-step rebase guidance with conflict triage
Preflight checks to ensure a clean working tree and up-to-date remotes
Conflict resolution workflows with per-file strategies and continuation
Completion verification and post-rebase checks

Quick Start

Rebase the current branch onto the target branch, then resolve any conflicts using the guided workflow.

Frequently Asked Questions about rebase-assistant

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

FAQPage Schema

How do I safely rebase a git branch without losing commits?▼

A safe git rebase requires preflight checks to confirm a clean working tree and up-to-date remotes before applying commits. This prevents data loss by enforcing a non-destructive completion flow using standard Git commands.

What is the best way to handle git rebase conflicts when preparing a pull request?▼

The best way to handle git rebase conflicts is using a guided workflow with built-in conflict triage and per-file resolution strategies. This ensures safe conflict resolution and provides continuation steps until the rebase is complete.

How do I resolve per-file conflicts during a branch rebase?▼

To resolve per-file conflicts during a branch rebase, follow a guided conflict triage workflow that provides specific resolution strategies for each file. This allows you to address conflicts systematically and continue the rebase safely.

What preflight checks are required before rebasing onto a target branch?▼

Preflight checks required before rebasing onto a target branch include verifying a clean working tree and ensuring remotes are up to date. These checks guarantee a safe baseline before the rebase operation begins.

Can I update a feature branch by rebasing onto a shared history without causing disruptions?▼

Yes, you can update a feature branch by rebasing onto a shared history without disruptions by using a step-by-step workflow with completion verification. This non-destructive flow integrates work safely using standard Git commands.

Why does my rebase fail when the working tree is not clean?▼

Your rebase fails when the working tree is not clean because preflight checks block the operation to prevent data loss. A clean working tree is required to ensure a safe, non-destructive rebase process.