Github has three possible merging modes from the UI:
Of those, we want "squash and merge" 99% of the time, but sometimes other methods are chosen, resulting in a less than ideal commit graph.
This is configurable via .asf.yml :
I propose that we disable the "merge" and "rebase" options for every Phoenix repo via the .asf.yml file.
This only applies to the GitHub Web UI, the other methods can still be used via the standard git operations.