this post was submitted on 31 Jul 2025

705 points (98.4% liked)

Programmer Humor

25460 readers

1090 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

705

Merge conflicts (feddit.nl)

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

[–] marcos@lemmy.world 17 points 3 days 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.