529
Please let me squash a merge commit (thelemmy.club)
submitted 4 months ago by 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
[–] 3 points 4 months ago (1 child)

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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 1 point 4 months 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).

  • permalink
  • fedilink
  • source
  • parent