Git Rebase

This walks you through git rebase with a strong emphasis on conflict resolution strategy. The core insight is smart: squash your commits first when you've got multiple feature commits, so you only resolve conflicts once instead of per-commit. It includes backup scripts, a conflict analysis tool, and a detailed decision framework for handling merge markers. The guide assumes you understand git basics but struggle with complex rebases where you need to preserve logic from both branches. It's opinionated about workflow (always backup, always validate, never force push without --force-with-lease) and includes actual bash scripts to automate the tedious parts. Best for teams that rebase frequently and want a repeatable process instead of winging it each time.

Install to Claude Code

npx -y skills add pedronauck/skills --skill git-rebase --agent claude-code