Use squash-merging method for merging PRs

[sisp]

Just a simple suggestion towards a cleaner Git history:

I think many projects these days have adopted the squash-merging method for merging PRs. Typically, a PR consists of a single logical change of the target branch. This means, when a PR is merged, the Git history of the target branch receives one additional commit, even though the PR might have several commits due to code review and/or iterative development. Currently, it seems PRs are merged with an additional merge commit which clutters the Git history and makes it harder to read. If squash-merging was used, the Git history would become cleaner.

What do you think?

[danielleroux]

We use squash merging, but not in general if the PR have a clean history we do a classic merge.

[sisp]

Clean history as in multiple commits each with a logical unit of change in one PR? My point is that the merge commit clutters the history and seems unnecessary with squash-merge (in case the result of the PR is just one logical unit of change). If you want to merge several commits in one PR, which I find less common, a rebase and merge without squashing should also get rid of the extra commit.

[danielleroux]

Thats a good point! I discussed this with @nuke-ellington.

PR merge methods looks like the following

[sisp]

The two enabled options look like what I mentioned. The one at the top should be the only one that leads to a merge commit. The recently merged PRs today don't show a merge commit anymore, so I assume you're using those two methods now. 🎉

[danielleroux]

👍