Programmer Humor

26762 readers

2309 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

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

683

Merge conflicts (infosec.pub)

submitted 2 months ago by F04118F@feddit.nl to c/programmer_humor@programming.dev

52 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] aquovie@lemmy.cafe 11 points 2 months ago* (last edited 2 months ago) (6 children)

I'll never understand why we didn't just go back to saying "trunk".

[–] zarkanian@sh.itjust.works 14 points 2 months ago (4 children)

"Trunk" is nice because it fits with "branch" in the tree metaphor, but "main" does have fewer letters.

[–] Lifter@discuss.tchncs.de 5 points 2 months ago (3 children)

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?

[–] aquovie@lemmy.cafe 2 points 2 months ago

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!

load more comments (2 replies)

load more comments (3 replies)