Why does it use --force-with-lease instead of a standard force push?

--force-with-lease is a safety mechanism that prevents you from overwriting remote work that you haven't yet fetched, protecting your teammates' contributions.

How does this skill detect my default branch?

The skill dynamically queries your remote origin settings to identify the HEAD branch, ensuring compatibility whether your project uses 'main', 'master', or a custom branch name.

What happens if a rebase encounter conflicts?

The skill provides a structured troubleshooting guide to help you identify conflicting files, resolve them, and safely continue or abort the rebase process.

Can I use this on my main branch?

As a safety guardrail, this workflow is designed to be used on feature or working branches only, preventing accidental history rewrites on your primary default branch.

Git Rebase Workflow

Name: Git Rebase Workflow
Author: natsuume

bynatsuume

Developer Tools

Synchronizes working branches with remote default branches using git rebase for a clean and linear commit history.

About

The Git Rebase Workflow skill streamlines the process of keeping feature branches up to date with the latest changes from a remote repository. It automatically detects the default branch (such as main or master), fetches remote updates, and performs a rebase while providing structured guidance on conflict resolution. By emphasizing the use of --force-with-lease for remote updates, it ensures that developers can maintain a clean project history without the risk of accidentally overwriting a collaborator's work, making it ideal for teams following a rebase-centric development model.

Key Features

Pre-rebase state validation to prevent data loss
Automated remote fetching and rebase execution
Dynamic default branch detection (main/master/develop)
Safe push implementation using --force-with-lease
0 GitHub stars
Guided conflict resolution step-by-step instructions

Use Cases

Resolving upstream conflicts in a collaborative environment
Cleaning up commit history before submitting a pull request
Updating a feature branch with the latest changes from the main branch

About

Key Features

Pre-rebase state validation to prevent data loss
Automated remote fetching and rebase execution
Dynamic default branch detection (main/master/develop)
Safe push implementation using --force-with-lease
0 GitHub stars
Guided conflict resolution step-by-step instructions

Use Cases

Resolving upstream conflicts in a collaborative environment
Cleaning up commit history before submitting a pull request
Updating a feature branch with the latest changes from the main branch