Advanced Git Workflows

Master complex git operations — interactive rebasing, cherry-picking, bisecting, reflog recovery, subtree merging, and conflict resolution strategies for large teams and monorepos.

This skill handles the git operations that trip up even experienced developers. It guides you through interactive rebases, helps recover lost commits via reflog, resolves complex merge conflicts, implements branching strategies (trunk-based, git-flow), and manages monorepo workflows with sparse checkout.

When to use

Use when you need to rewrite git history, recover lost work, resolve hairy merge conflicts, set up a branching strategy for your team, or manage a monorepo with multiple packages.

Examples

Recover lost commits

Find and restore accidentally deleted commits

I accidentally ran git reset --hard and lost my last 5 commits — help me recover them using reflog

Clean up messy history

Squash and reorder commits before merging

I have 23 messy commits on this branch — help me squash them into 3 logical commits with good messages before opening the PR