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

Programmer Humor

31299 readers
1041 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
 
you are viewing a single comment's thread
view the rest of the comments
[–] kungen@feddit.nu 5 points 1 week ago (1 children)

Haha same. But that's why you do it in another branch, and then squash-merge.

[–] ranzispa@mander.xyz 2 points 1 week ago (2 children)

I like squash merge on small changes, but when larger code changes are there it becomes a huge commit which is difficult to review if you ever have to go back.

[–] firelizzard@programming.dev 1 points 4 days ago

If the squash merge is too big to review then that change should have been broken up into multiple separate changes. Regardless whether you’re using pull requests or some equivalent or directly merging feature branches, if “one unit of work” is too much to review when squashed, then your unit of work is too big and needs to be split up. A unit of work should always be reviewable as a whole.

[–] psycotica0@lemmy.ca 1 points 1 week ago

Right... for sure... but then if you don't want to squash, then it doesn't matter you can't squash a merge commit.