Consider introducing a Github merge queue

[LachlanMcKee]

Currently all branches are merged into main without requiring being up to date with main.

This could mean we merge an old branch that has a breaking change, and the main branch needs to be fixed.

Also, potentially if we introduce stricter static code analysis, potentially this older branch will increase our tech debt

We should consider using a merge queue to avoid this problem: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

Otherwise we could also enforce that all PRs need to be up to date with main, but I believe that will be far more annoying.

[LachlanMcKee]

Thoughts @CherryPerry / @zsoltk / @KovalevAndrey ?

[CherryPerry]

We do not need a merge queue but this option instead, it will be enough.

[LachlanMcKee]

That's probably sufficient, however at least with the merge queue you don't need to keep updating, you just press merge and GitHub will manage multiple merges as long as there are no problems

[LachlanMcKee]

@KovalevAndrey / @zsoltk thoughts about requiring branches to be up to date? Will avoid master being broken accidentally

[zsoltk]

@LachlanMcKee it's enabled now.

[LachlanMcKee]

Thanks!