Git Rebase Sync

A comprehensive rebase workflow that handles the messier parts of syncing feature branches: conflict resolution, stacked branch detection, and force-push coordination. It catches branches that point to commits in your rebase range and uses git's `--update-refs` flag to move them along instead of orphaning them on old commits. The conflict loop is methodical, stopping to ask when resolution intent isn't obvious rather than guessing at product behavior. Everything history-rewriting requires explicit confirmation with the exact command printed first. Creates backup tags automatically and defaults to `--force-with-lease` for safer pushes. Useful if you work with stacked PRs or just want guardrails around rebase operations that can quietly break things.

skills.sh installs: 146
GitHub stars: 48
last updated: Jun 3, 2026

View on GitHub

Install

$ npx -y skills add 0xbigboss/claude-code --skill git-rebase-sync --agent claude-code

Installs into .claude/skills of the current project.

Files

git-rebase-sync

Use this skill when you need to sync a feature branch onto the latest origin/{base_branch} via git rebase, including conflict resolution with explicit clarification questions when intent is ambiguous.

Goals

Rebase the current branch onto a specified base branch (often the repo default branch like dev or main).
Resolve conflicts deliberately, without guesswork.
Keep safety rails: backup ref, confirmations before history-rewriting commands, and safe pushing.

Hard Rules

Do not create or switch to a different feature branch. Operate on the current branch name unless I explicitly ask otherwise.
Before any history-rewriting command (git rebase ..., git push --force*), print the exact command(s) you will run and wait for my confirmation.
Create a local backup ref (prefer an annotated tag) before starting the rebase. Do not push backup refs unless I explicitly ask.
Prefer git push --force-with-lease, never plain --force.
If the correct conflict resolution is unclear, stop and ask a targeted question. Do not invent product behavior.