Me: You didn't squash that PR into develop....
Them: There was no option to squash...

AAAAAAAAAAAAAAAAAAAAAA 🙂

Bloody fuckers

I don't remember why but we stopped squashing commits a long time ago. Why are you advocating for it? Just curious the reasons for preferences.

@demortes There are many benefits to squashing into develop:
• clean git history.
• easier rebasing.
• easier changelog compilation/generation.

what's annoying is the blatant lie of "there was no option to squash." ... it's more of "I don't care enough to click the little arrow to choose squash."

@bananaerror yeah I got that. Just wondering why people squash.

@demortes well, squash is a fun game. You should try it, sports in general all good for you

@galileopy I don't do sports. Last time I did a tsunami almost killed Japan.

I set squash as the default option in for the repo in github.

Sure you can bypass it if you do manual merges but that gets rid of MOST problems.