rebase-on-main

To rebase a feature branch onto origin main safely, this Skill automates git fetch and rebase operations while managing dirty working trees through intelligent stash or commit decisions. It handles the synchronization workflow without manual intervention.

To resolve git merge conflicts for database migrations and lockfiles during a rebase, this Skill implements specific conflict resolution heuristics tailored for project-specific files. It provides structured guidance to handle these targeted file types.

When synchronizing a branch with main, uncommitted changes in dirty working trees are managed by automatically deciding between stash or commit strategies based on file content and branch state. This ensures local modifications are preserved safely.

Yes, you can use this rebase workflow without any external dependencies. The Skill operates independently with no required dependencies, relying solely on standard git version-control commands to synchronize branches.

Use an automated git rebase instead of a standard merge to sync branches when you need a clean history without manual intervention. This approach is ideal for bringing work up to date with production-ready code before opening a pull request.