this post was submitted on 31 Jul 2025

722 points (98.4% liked)

Programmer Humor

25548 readers

166 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

722

Merge conflicts (feddit.nl)

submitted 1 week ago by F04118F@feddit.nl to c/programmer_humor@programming.dev

60 comments fedilink hide all child comments

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

[–] timbuck2themoon@sh.itjust.works 3 points 1 week ago

Agree with this. Never changed from master as it would cost the business money to do so (and involve a ton of headaches) for no reason. Thankfully the whole dept agreed on that.