Should we start using squash merging?

[amacado]

What do you think about squash merging? I think it would result in a cleaner commit history where it's easier to find out which icon was added when. I did squash merging for the last few icon pull requests and as you can see in the history it's very easy to check which icon was added when.

All those "mini-fixes" with undescriptive commit messages only make things harder to read (see two samples I marked here):

This is what a squashed merge result look like:

I would not disable other merge methods, since there could be reasons to use them for certain pull requests, but in general I would suggest to squash merge (especially icon-related pull requests).

[Thomas-Boi]

That looks like a good idea. Will this behaviour be done automatically by GitHub or do we have to manually do it?

[amacado]

You have to select it while merging a pull request. GitHub will keep your latest selection as default value for the next time:

As I mentioned before, we CAN enforce GitHub to only provide the option to squash merge, but I would not suggest to enforce it.

[Thomas-Boi]

Ah ok, that's a pretty flexible option then. I'll do that for future PRs then.

[amacado]

TL;TR;
We are using squash merging on future pull requests. We will not enforce this setting but recommend it.