this post was submitted on 31 Jul 2025

729 points (98.4% liked)

Programmer Humor

26014 readers

965 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

729

Merge conflicts (feddit.nl)

submitted 4 weeks ago by F04118F@feddit.nl to c/programmer_humor@programming.dev

60 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] limer@lemmy.ml 2 points 3 weeks ago (1 children)

Actually this cost a lot of time and money. Even today I have to take an extra step to see if master or main is use . Before it was standard.

Curse this

[–] TrickDacy@lemmy.world -1 points 3 weeks ago

If this was hard for your company to change, you did things wrong. I work with git everyday and I've no idea what extra step you mean. Git software of all stripes will show you front and center what branches exist and what's default. People pissed about this just wanna whine and they can downvote me a million times if they want