How Git keeps every version of your project without filling your disk
Git merge conflicts: why Git stops and asks you
Most Git merges go through on their own. Then one day Git stops halfway, prints the word conflict and waits for you. Why can it not choose, and what do you do next?
-
1
On main you made the frog slower, and on harder-levels, a branch you started for tougher levels, you made the game harder. Now you run
git merge harder-levels. -
2
This time Git stops halfway and prints the word conflict, though the last merge went through on its own.
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