What if the rebase still fails with the 'theirs' strategy?

If conflicts cannot be auto-resolved, the skill provides a fallback workflow to check git status, manually accept the upstream version for specific files, and continue the rebase process.

What happens to my local changes during a conflict?

This skill uses the '-X theirs' strategy, which means if a conflict occurs, the version from the upstream (main) branch is automatically preferred and your local conflicting change is discarded for that specific block.

Is the force-pushing step safe?

Yes, the skill uses the --force-with-lease flag, which is a safer alternative to a standard force-push because it prevents you from overwriting remote work that you haven't yet fetched.

Does this skill work with branches other than main?

The current implementation is specifically configured to rebase onto the 'origin/main' branch, making it ideal for standard main-branch-based development workflows.

Git Rebase Manager

Name: Git Rebase Manager
Author: a2f0

bya2f0

0•

Developer Tools

Automates the process of rebasing local branches onto the main branch while automatically resolving conflicts in favor of upstream changes.

The Git Rebase Manager skill provides a standardized workflow for synchronizing feature branches with the latest main branch. It automates the fetching of remote changes, initiates a rebase using the 'theirs' strategy to prioritize upstream code during conflicts, and performs a safe force-push using the lease flag. This skill is ideal for developers who need to quickly update their working branches while ensuring compatibility with the current production codebase, significantly reducing the manual overhead of conflict resolution.