this post was submitted on 31 Jul 2025

650 points (98.2% liked)

Programmer Humor

25425 readers

1301 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

650

Merge conflicts (infosec.pub)

submitted 1 day 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

[–] potoo22@programming.dev 69 points 1 day ago (11 children)

We have a deployed branch. It doesn't get merged into master until it gets reviewed... the technical debt got too big so it never gets reviewed and we just keep branching off deployed

[–] marcos@lemmy.world 14 points 1 day ago

Well, when you said "we have a deployed branch", you could just have stopped there. All the rest is just what happens after you decide to rename your master branch.

load more comments (10 replies)