this post was submitted on 30 Apr 2026
510 points (99.2% liked)

Programmer Humor

31338 readers
2010 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
anzo@programming.dev
Feyter@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
510
Please let me squash a merge commit (europe.pub)
submitted 1 week ago by jxk@sh.itjust.works to c/programmer_humor@programming.dev
50 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] trem@lemmy.blahaj.zone 1 points 1 week ago

I don't work with merges, so maybe I'm way off base, but I thought they meant, they're working on another branch or fork, then merging the base branch into theirs every so often to get the newest changes, and then that creates multiple merge commits, which they can't squash at the end...?

I'm not sure, about that last part, but the rest, I've definitely seen with contributors that didn't know to work with rebases (and unfortunately we're on GitHub, which only half-assedly supports working with rebases by default).