Billy and Eddie's Declassified Git Survival Guide
summary
Covers concrete rescue steps: use git reflog as safety net to recover dropped commits, run git fetch vs git pull to see origin/main, resolve conflicts with git merge --no-ff or interactive git rebase -i, and prefer squash before rebasing to avoid repeated conflicts; demonstrates recovering a mistakenly squashed commit with git reset --hard to a reflog SHA and explains rebase -r to include merges when removing a merge commit. Uses a real Kubernetes PR with ~35 commits to show the problem and the successful squash-and-rebase fix.
AI-written summary · about
chapters (20)
- 0:00Git survival guide intro
- 1:03Worst Git repo disasters
- 2:48Git as distributed system
- 6:37Fetching and pulling changes
- 8:41Merge conflicts step by step
- 11:30Commits with multiple parents
- 11:53Git rebase rewrites history
- 13:21Linear history after rebase
- 14:03Interactive rebase for clean commits
- 15:27Rebases cause repeated conflicts
- 17:33Squashing commits
- 18:58Fixing squash mistakes
- 20:43Recovering lost commits
- 23:34Detached HEAD state
- 26:45Preventing orphan commits
- 28:09Failed Kubernetes PR case study
- 31:40Simplify PRs with squash/rebase
- 35:11Final cleanup of Kubernetes PR
- 36:33Summary and recovery tips
- 36:54Q&A on Git internals
related talks
35mThe Git you don't know
39mGetting out of trouble by understanding Git
40mAdvanced Git Magic
25mUnderstanding git - even the scary parts
48mKnowledge is Power: Getting out of trouble by understanding Git
43mGit: Undoing Things and recovering from Mistakes
56mKnowledge is Power: Getting out of Trouble by Understanding Git
48mBe the .txt you seek: Getting out of trouble by understanding Git