this post was submitted on 31 Jul 2025

672 points (98.3% liked)

Programmer Humor

25460 readers

1744 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

anzo@programming.dev

Feyter@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

672

Merge conflicts (feddit.nl)

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

[–] locuester@lemmy.zip 20 points 4 days ago (1 children)

I’ve been a dev at 8 places over 28 years and have never heard of this level of incompetence since git came along. Prior to git, with cvs, svn, tfs, vss - yeah, lots of incompetence because the tools sucked. Git solves all those problems tho!

[–] SpaceNoodle@lemmy.world 10 points 4 days ago

The real problem is stupid/lazy people, which no amount of tooling can address.