Your code's time machine: commits, branches, merges, undoing and resolving conflicts.
Key ideas
- A change lives in three places: the working tree, the index and the commits.
git addstages it,git commitrecords it. - A branch is a label stuck on a commit; a new commit moves the label forward.
- In a conflict Git writes both versions into the file: keep what you want, delete the markers, then
addandcommit.
Pattern
git switch -c feature # ... değiştir / edit ... git add . git commit -m "Özellik" git switch main git merge feature
Finish these first:Terminal Basics
Lessons
Each lesson explains one idea from zero and ends with a few tasks. Lessons open in order; the explanation can be read at any time.
Boss
05
A conflict
Git task
The boss opens when every lesson of the topic is finished. Solve it too and the topic is complete, and the topics after it open.