rebase-on-main

What problem does it solve?

This Skill helps you safely move a feature branch onto the latest mainline branch without losing work, introducing accidental regressions, or rewriting history unsafely.

Core Features & Use Cases

• Safe Rebase Workflow: Creates a backup before rewriting history and refuses risky operations on detached, shared, or protected branches.
• Conflict Analysis and Resolution: Explains rebase conflicts, inspects markers, and guides intentional merges that preserve both mainline fixes and feature intent.
• Validation and Push Guardrails: Runs merge validation checks, recommends project-specific tests, and pushes only with force-with-lease.
• Use Case: A developer finishes a feature branch and needs to rebase it onto the latest origin/main, resolve a few conflicts, validate the result, and push it back safely.

Quick Start

Ask the skill to rebase my current branch onto the repository's main branch, resolve any conflicts safely, run validation, and force-push with lease if everything passes.