Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

When to Use This Skill

• Cleaning up commit history before merging (rebase)
• Applying specific commits across branches (cherry-pick)
• Finding commits that introduced bugs (bisect)
• Working on multiple features simultaneously (worktrees)
• Recovering from Git mistakes or lost commits (reflog)
• Synchronizing diverged branches

Workflow

1. Context: Are you cleaning history, recovering lost work, or isolating a bug?
2. Safety: Always create a backup branch before destructive operations (git branch backup-before-rebase).
3. Execute: Use the specific command (rebase -i, bisect, reflog).
4. Verify: Check log/tests to ensure integrity.
5. Push: If history changed, use --force-with-lease.