Tutorial: Take Control of Git: Beyond the Basics
summary
Five short repo-based games (Hike Disaster, Research, Plan, Packing, Redux) teach concrete commands and workflows: use git reflog to recover personal history, use git reset --hard to retarget a branch and mixed reset to uncommit while keeping changes, use checkout/restore or git switch to pull specific files from other branches, and use interactive rebase to rebase a feature branch and fast‑forward merge back to main. Repos include shell scripts (./newgame, ./next) and participants spend ~20 minutes per exercise practicing hands‑on.
AI-written summary · about
chapters (11)
- 0:00Welcome
- 1:47Workshop goals
- 8:25How Git games work
- 11:13Demo: First game
- 36:17Reset hard and refs
- 39:58Game two: Hike Research
- 51:11Game three: Hike Plan
- 1:02:55Game four: Hike Packing
- 1:11:32Game five: Hike Redux
- 1:20:57Recap
- 1:25:15Takeaways
related talks
28mHow to Really Get Git
39mGetting out of trouble by understanding Git
26mGit in Control, Version Control and How it Could save Your Life
40mAdvanced Git Magic
25mUnderstanding git - even the scary parts
35mThe Git you don't know
43mGit stories from the front line
56mKnowledge is Power: Getting out of Trouble by Understanding Git