Git Scenarios: How Do I Fix That?
summary
Live demo of command-line and GUI fixes: recovers from a detached HEAD by creating a branch, uses git reflog to find lost commits, performs cherry-pick and resolves conflicts with Beyond Compare or VS Code, rebases and squashes multiple commits via interactive rebase into one clean feature commit, runs git bisect to locate the exact bad commit and reverts it, and demonstrates GitHub Flow vs Git Flow with fast‑forward merges, tags, and branch cleanup — all commands executed and shown working.
AI-written summary · about
chapters (31)
- 0:00Introduction to Git scenarios
- 1:23Understanding the .git folder
- 2:50Basic Git commands and commits
- 5:24Detached HEAD state explained
- 7:31Recovering lost commits
- 8:56Visualizing commit history
- 9:59Merging branches
- 10:43Resetting and moving labels
- 12:53Handling uncommitted changes
- 14:18Staging partial changes
- 16:40Switching branches safely
- 17:48Cherry-picking commits
- 20:42Deleting temporary branches
- 21:53Rebasing branches
- 24:01Cleaning untracked files
- 25:24Creating .gitignore
- 26:28Squashing commits
- 28:59Handling team changes
- 31:06GitHub flow explained
- 31:48Introduction to Git flow
- 33:41Managing release branches
- 35:53Tagging and deploying
- 36:56Git flow branches overview
- 37:40GitHub flow vs Git flow
- 38:24Mainline development
- 39:06Why avoid Git submodules
- 40:31Finding bugs with git bisect
- 43:48Reverting commits
- 44:31Choosing a branching strategy
- 46:03Creating Git aliases
- 49:20Summary and closing
