rebased

What problem does it solve?

Manually resolving git rebase conflicts when updating a feature branch against main is time-consuming, error-prone, and often leads to lost code intent if changes are blindly picked from one side. This skill automates the entire rebase workflow while preserving the purpose of all commits.

Core Features & Use Cases

• Intent-preserving conflict resolution: Analyzes changes from both the main branch and the feature branch to merge conflicts semantically instead of discarding one side's changes.
• Automated file handling: Regenerates lock files (bun.lockb, package-lock.json, yarn.lock) and generated files (migrations, snapshots) instead of requiring manual hand-merging.
• Safe, guided workflow: Runs pre-flight checks to catch dirty working trees, in-progress rebases, and detached HEAD states, and never force-pushes or discards work without explicit user confirmation. Use case example: If your feature branch is 12 commits behind main with multiple merge conflicts across source code, lock files, and generated migration files, this skill will resolve each conflict while preserving your changes and main's updates, no manual merge work required.

Quick Start

Ask your AI agent to run the /rebased command to rebase your current branch onto origin/main and automatically resolve any merge conflicts that arise.