git-workflows

Recover lost commits after a hard reset by using the Git reflog to trace previous HEAD positions and reset your branch back to the target reference. This Skill provides precise workflow guidance to restore mistakenly reset work.

Isolate a regression bug in a large Git repository by using the Git bisect mechanism to binary search through your commit history. This Skill guides you through marking good and bad commits to pinpoint the exact breaking change.

Resolve complex merge conflicts during a Git rebase by identifying conflicting files, editing them to reconcile differences, staging the resolutions, and continuing the rebase sequence. This workflow handles precise conflict resolution steps.

Work on multiple branches simultaneously without extra clones by using Git worktrees to manage parallel branch work. This approach allows you to checkout and develop on different branches in separate directories within the same repository.

Clean up and squash commits before merging a feature branch by executing an interactive Git rebase to reorder, squash, edit, or split commits. This workflow prepares a clean feature history for merging into the main branch.

Git sparse checkout works for managing monorepo repositories by allowing you to checkout only specific directories rather than the entire project tree. This workflow provides guidance for large-scale monorepo checkout scenarios.