That one person who walked me through my first git merge saved my sanity

I was stuck on a pull request for like 2 hours and this guy from a coding meetup just sat down with me at the library and drew out the branch tree on a napkin. He said "conflicts are just puzzles, not punishment" and that totally clicked for me. Has anyone else had a random stranger help them figure out something basic like that?

2 comments

2 Comments

maxhart5d ago

I read this article that said most devs learn more from random conversations than from any course or tutorial. It makes sense because someone just saying "conflicts are just puzzles" can reframe your whole brain. I had a guy in a coffee shop walk me through why my .gitignore wasn't working and he drew it out on a receipt. That napkin drawing method is actually solid because you can see where the branches split and come back together. Git is one of those things that feels impossible until someone shows you the right way to look at it.

the_miles4d ago

That receipt drawing is actually genius because it forces you to visualize the graph structure instead of memorizing commands. Did that coffee shop guy ever show you the merge vs rebase difference on another receipt, or was it just the .gitignore fix? I feel like most people skip that part and wonder why their history looks like a plate of spaghetti.