Git & Version Control

Branches, merges, rebases, and the recovery tools nobody teaches — from the object model underneath every command to opening a clean PR and undoing a mistake without panic.

0 of 30 lessons complete~432 min total

Start track

The Git Mental ModelGit isn't a list of diffs — it's a content-addressable store of snapshots. Once that clicks, every command stops being magic.15 min
git init and ConfigTurning a folder into a repo, telling Git who you are, and setting up .gitignore before you commit anything you'll regret.12 min
The Three TreesWorking directory, staging area, and HEAD — the actual model behind git add, git commit, and what git status is telling you.15 min
Commits and HistoryReading git log like it actually matters, what's really inside a commit, and why the message you write today is a message future-you has to trust.15 min
Resolving Merge ConflictsWhat actually triggers a conflict, how to read the markers Git drops into your file, and how to get out cleanly — including bailing out entirely.18 min
Branching FundamentalsA branch isn't a copy of your codebase — it's a 41-byte pointer to one commit. That's why creating one is instant, no matter how big the repo is.12 min
Merginggit merge does one of two completely different things depending on history shape — a fast-forward that just slides a pointer, or a true merge that creates a new commit with two parents.14 min
RebasingRebase doesn't move commits — it replays them. Same changes, brand-new commits, on top of a different base. Powerful for local cleanup, dangerous the moment someone else has pulled the commits you're rewriting.16 min
Interactive Rebasegit rebase -i HEAD~N hands you an editable todo list of your last N commits — squash, fixup, reword, drop, reorder — before anyone else ever sees them.16 min
Remotes and Trackingorigin isn't magic — it's a nickname for a URL. And git pull isn't its own operation; it's fetch, then merge, glued together, which explains most of the confusion around it.14 min
Pushing and Pull RequestsLocal commits don't review themselves. The real workflow: branch, commit, push with -u, open a PR, get reviewed, pick a merge strategy.18 min
Code Review as a Git WorkflowReview comments aren't a to-do list you close in your head — they're Git operations. New commits vs. amend, when to force-push, and how to actually resolve a thread.15 min