How Git keeps every version of your project without filling your disk
Git merge: how two lines of work become one
Two Git branches both moved on, and each holds work the other lacks. Git still joins them on its own, in seconds, and keeps every step of both, with a commit unlike any other.
-
1
You built a faster frog on a branch called faster-frog, and meanwhile you fixed Miva's typo on main. Now each name has a commit the other one lacks.
-
2
On main, you run
git merge faster-frog. This time main cannot just slide forward, or the typo fix would be left behind, so Git has to build something new.
The rest of this episode is for subscribers
Subscribe to read every premium episode. You can cancel when you want.
Paid yearly: $99 instead of $119.88