[OMID-229] Allow only "squash and merge" from GitHub UI

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 1.1.0
• Assignee: Istvan Toth
• Reporter: Istvan Toth
• Created: 16/Aug/22 08:14
• Updated: 17/Oct/22 08:52
• Resolved: 16/Aug/22 11:27

Description

Github has three possible merging modes from the UI:

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges

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 : 

https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features#Git.asf.yamlfeatures-Mergebuttons

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.

Issue Links

• is related to: PHOENIX-6771 Allow only "squash and merge" from GitHub UI
• links to: GitHub Pull Request #114
• links to: OMID PR