Member-only story
Git Tutorial, From Beginner to Advanced
Most Git tutorials teach you how to commit and stop there. Almost none cover what to do on a Friday evening when you pushed the wrong thing to main and three teammates are pulling it right now. This Git tutorial walks the whole road, from your first commit to parallel branches, merge conflicts, force pushes and rescuing work you thought was gone. Every example comes from one small team project that I actually ran, so the commands and the output you see are what Git printed.
Meet the team and the project
Git starts to hurt when more than one person touches the same code. So the examples in this article follow a small team instead of a lone developer.
The project is a menu website for a cafe called kafe-menu. Four people work on it at the same time.
- Ayse owns the menu items and prices
- Mehmet owns the order logic
- Can owns the styles
- Elif owns the vegan options and the docs
They work on different files most of the time and on the same lines some of the time. That second part is where conflicts, bad pushes and “who broke main” conversations come from, and we will walk through every one of them.
