git-rebase

What problem does it solve?

Resolve Git merge/rebase conflicts safely by applying an AI-guided workflow with clear decision criteria. It covers common conflict scenarios, promotes automated resolutions when safe, and escalates for user input on business-logic or safety concerns. It enforces a build verification step and prohibits risky operations on protected branches, ensuring reliable and auditable outcomes.

Core Features & Use Cases

• Conflict detection & decision support: identifies conflict types and suggests safe auto-resolve vs escalation.
• Safety-first rules: enforces checks like build verification after resolution and prohibits risky actions on protected branches.
• Guided decision tree: provides structured steps to resolve conflicts or escalate to user when needed.
• In-context guidance: explains how to read conflicts, apply safe resolutions, and verify with a build.

Quick Start

Activate the git-rebase skill when a rebase conflict occurs and follow the decision tree to auto-resolve or escalate to the user.