728
Merge conflicts
(feddit.nl)
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
I'll never understand why we didn't just go back to saying "trunk".
"Trunk" is nice because it fits with "branch" in the tree metaphor, but "main" does have fewer letters.
Yep, the metaphor would be good if git was a tree but kt isn't. It's very rare to have a real tree branch merge back into the trunk. Would it even still be called a branch after merging?
If it's not a tree, why call it a branch? Maybe branch doesn't make any sense either. Maybe none of this makes any sense! Oh my God, what are we even doing here?!?! Ahhhhhhhhhhhh!