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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
522
Please let me squash a merge commit (sh.itjust.works)
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
[–] Miaou@jlai.lu 1 points 1 week ago

I often end up squashing all my changes into a single commit, rebase it, and then reset HEAD^ to rewrite some commit history.

Brute force, but better than resolving 10 conflicts in the same file over and over