git-mastery-suite

Recover lost commits using Git's reflog, which tracks all HEAD movements. Run `git reflog` to find the commit SHA, then create a new branch from it or rebase it onto your current branch. This restores work that appears deleted but remains in Git's history until garbage collection.

Interactive rebase lets you reword, squash, drop, or reorder commits to maintain a clean history. Use `git rebase -i` to select commits, then choose actions like squash to combine them or reword to edit messages. This produces a polished, linear history before merging.

Git worktrees create isolated working directories for different branches, eliminating context switching and stash overhead. Run `git worktree add` to spawn a parallel workspace, work independently on each branch, then merge and clean up. This accelerates parallel development workflows.

This Skill handles interactive conflict resolution, commit surgery, and safe recovery strategies for professional repositories. Combine rebasing, worktrees, and reflog techniques to untangle broken history, fix botched merges, and restore a reliable codebase without data loss.

Bisect automates binary search through commit history to locate the exact change that broke functionality. Mark a known-good and known-bad commit, then bisect tests intermediate commits until it isolates the culprit, speeding root-cause analysis in large repositories.

Rebasing rewrites history and should not be used on shared, published branches where teammates have already committed. Use it only on local or feature branches before pushing. Force-pushing rebased branches to shared branches causes conflicts and frustration; merge is safer for collaborative work.