git-rebase-sync

What problem does it solve?

This Skill removes the risk and tedium of synchronizing a local feature branch onto the most recent remote base branch by guiding a careful, confirmable rebase process and deliberate conflict resolution instead of blind merges or force pushes.

Core Features & Use Cases

• Safe backups: create a local annotated tag as a pre-rebase recovery point.
• Controlled rebase: fetch origin, determine base, and run interactive rebase with an option to preserve merge commits.
• Deliberate conflict resolution: inspect conflicts, ask targeted questions when intent is ambiguous, stage resolved files, and continue the rebase loop.
• Safe push: require explicit confirmation and prefer git push --force-with-lease when updating remote history.
• Use Case: update a long-running feature branch onto the repository default branch before opening or updating a pull request, ensuring tests and linters run after rebase.

Quick Start

Rebase the current branch onto the repository default base, create a local annotated backup tag first, and ask me to confirm the exact rebase and push commands before executing them.