django / daphne

Django Channels HTTP/WebSocket server
BSD 3-Clause "New" or "Revised" License
2.32k stars 256 forks source link

[pre-commit.ci] pre-commit autoupdate #448

Closed pre-commit-ci[bot] closed 1 year ago

pre-commit-ci[bot] commented 1 year ago

updates:

smithdc1 commented 1 year ago

I was here, but realised I didn't know which merge strategy is preferred.

I assume its squash and merge?

adamchainz commented 1 year ago

Yes squash and merge, as can be seen from the previous commits on main: https://github.com/django/daphne/commits/main

@carltongibson perhaps you could disable the other merge options in settings?

carltongibson commented 1 year ago

Thanks both. I've disabled merge commits. (I tend to go for Squash and Merge, but Rebase is quite handy if you want multiple commits, for example)