Which pull request merge strategy should we use?

[jamie-o-wilkinson]

When merging pull requests, you can allow any combination of merge commits, squashing, or rebasing. At least one option must be enabled. If you have linear history requirement enabled on any protected branch, you must enable squashing or rebasing.

So far we've been carefully creating nice commit histories on our development branches via interactive rebasing, and then creating a merge commit when a PR is merged into a repo's main branch. This is fine, but incompatible with the linear history requirement option, if we wanted to use that.

Other things to consider are whether we prefer an easier to read linear history when looking through the git log, or if we prefer the extra information seeing previous branches and merge commits conveys.

Note that we can have any combination of merge strategies, but the poll seems to only allow single choices 😢

[jamie-o-wilkinson]

Closing as resolved in the tech weekly of meeting on 13/2/23