python-discord / king-arthur

King Arthur is the DevOps helper bot for Python Discord
MIT License
10 stars 7 forks source link

Squash merge #263

Closed jchristgit closed 2 months ago

jchristgit commented 2 months ago

Why do we use squash merge in this repository?

I think we should apply similar strategy that we apply to the infra repository.

jchristgit commented 2 months ago

Any updates?

jb3 commented 2 months ago

We don't, it appears as the default because it was the last used action and is the one that's enabled. Nothing here is different to the infra repository.

There is a policy file for ff-bot on main so everything is already setup to be able to /merge in the same way you would on infra.

PRs #243, #257, #261 and #264 were all merged using the fast-forward bot.

I've disabled all methods but squash merging now because:

There is nothing else that needs to be done here for ff-bot to work, it is already setup and as mentioned is being used.

jchristgit commented 2 months ago

Banks - thanks for the swift response as always, that explains it.

jb3 commented 2 months ago

Anything for my best-man!