697
Merge conflicts
(feddit.nl)
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 31 Jul 2025
697 points (100.0% liked)
Programmer Humor
25495 readers
2415 users here now
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.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 2 years ago
MODERATORS
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?
Not rare, but uncommon. Not sure if there's a Lemmy equivalent but r/treessuckingonthings shows trunks absorbing all sorts of things including branches
Yes, this is why I chose not to say that it was impossible.
Perhaps the mathematical definition of a tree is wrong in stating there should be not loops, or should change to another metaphor.
Hairs can split but never merges back again. Perhaps a split hair instead of a branch? We still trim or prune the ~~leaves~~ ends. What do you call the "trunk" of a hair?
Edit: formatting
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!