this post was submitted on 31 Jul 2025

652 points (98.2% liked)

Programmer Humor

25425 readers

1941 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

652

Merge conflicts (infosec.pub)

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

51 comments fedilink hide all child comments

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

[–] oce@jlai.lu 4 points 2 days ago

It could be a temporary hot fix to pass some issue in production, but could break other things if left longer. So better to revert it after the big issue had passed and take more time to work on a proper solution.