Programmer Humor

31226 readers

1654 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

356

Please let me squash a merge commit (sh.itjust.works)

submitted 3 days ago by jxk@sh.itjust.works to c/programmer_humor@programming.dev

44 comments fedilink hide all child comments

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

[–] kevincox@lemmy.ml 3 points 3 days ago (1 children)

I think it doesn't really make sense. Because you can't "squash" one commit. squash is taking multiple commits and making them one.

When you do a "squash merge" you are really saying "squash all the commits that are on this branch and not the target" then merge.

So you can't "squash a merge commit" you need at least one additional commit to squash in.

[–] trem@lemmy.blahaj.zone 2 points 2 days 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).