05. Version control
How you save the history of your code so you can rewind, branch off experiments, and collaborate without overwriting each other. In practice this means Git (the tool) and GitHub (the platform on top of it).
Entries
| # | Entry | Status | One-line description |
|---|---|---|---|
| 1 | What is version control? | 🟩 COMPLETE | A time machine for your code — and what life looks like without it |
| 2 | Git basics | 🟩 COMPLETE | Repos, commits, branches, remotes — the 5 concepts that explain 90% of Git |
| 3 | GitHub | 🟩 COMPLETE | Git hosting + collaboration tools (PRs, issues, actions) |
| 4 | Branches & merging | 🟩 COMPLETE | Working on features without touching main |
| 5 | Pull requests | 🟩 COMPLETE | How code review is done in practice |
| 6 | Rebase vs merge | 🟩 COMPLETE | Two ways to integrate branches — and when each is appropriate |
| 7 | Resolving merge conflicts | 🟩 COMPLETE | When two branches change the same line — what to do |
| 8 | Git rescue moves | 🟩 COMPLETE | ”Oh no I broke it” — undo, reset, reflog, the panic toolkit |
Suggested reading order
1 → 2 → 3 → 4 → 5 → 7 → 6 → 8. Skip 6 until you’ve used merge a few times — rebase makes more sense once you’ve felt merge’s pain.
See also
- 09. Tooling & dev environment — VS Code’s Git integration
- 06. Hosting & deployment — Vercel deploys on git push
- Gotchas — Git