git-workflows

Recover lost commits after an accidental git reset by using the reflog to identify the previous HEAD state and running git reset --hard <reflog-hash> to restore the branch pointer to the recovered commit.

Resolve merge conflicts during an interactive rebase by manually editing the conflicted files, staging them with git add, and continuing the rebase sequence with git rebase --continue to safely clean up history.

Locate a regression using git bisect by marking known good and bad commits, letting Git binary search the history, and running automated test scripts at each step to isolate the exact commit that introduced the bug.

Use git worktree for parallel development when you need to maintain a hotfix branch or run CI-related bisects without stashing your current work, allowing multiple working directories to share a single repository.

Cherry-pick specific commits across branches without merging by applying the target commit hash directly onto your current branch using git cherry-pick, which is ideal for hotfix creation and applying isolated changes.

Safely clean up Git history without force-pushing shared branches by performing interactive rebase operations locally, using squash and reword to organize commits, and avoiding force-push on protected remote branches to prevent overwriting team work.