this post was submitted on 31 Jul 2025
657 points (98.2% liked)

Programmer Humor

25425 readers
947 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

founded 2 years ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
657
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
[–] marcos@lemmy.world 10 points 2 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?

load more comments (2 replies)