this post was submitted on 31 Jul 2025

672 points (98.3% liked)

Programmer Humor

25460 readers

1744 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

anzo@programming.dev

Feyter@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

672

Merge conflicts (feddit.nl)

submitted 4 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

[–] marcos@lemmy.world 10 points 4 days ago (3 children)

I mean... Yeah, if it's in production just merge with its data. What sense does it make to even put another branch in prod?

[–] Gullible@sh.itjust.works 7 points 4 days ago

Might just be a workflow thing with a small group or singular dev. Sense is largely irrelevant in the face of “I’ve been doing it this way since 15 years before github came online”

[–] oce@jlai.lu 4 points 4 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.