this post was submitted on 31 Jul 2025
703 points (98.3% liked)

Programmer Humor

25425 readers
1042 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
703
Merge conflicts (feddit.nl)
submitted 2 days ago by F04118F@feddit.nl to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] potoo22@programming.dev 76 points 2 days 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

[–] rainwall@piefed.social 69 points 2 days ago* (last edited 2 days ago) (1 children)

Yes, we've had first master branch, but what about second master branch?

[–] mic_check_one_two@lemmy.dbzer0.com 9 points 1 day ago* (last edited 1 day ago)

Ah yes, by the end of the week we will have achieved full apotheosis: master-final-v3-deployed-2025_08_01-usethisone

load more comments (9 replies)