[jira] [Resolved] (PHOENIX-6771) Allow only "squash and merge" from GitHub UI

["Istvan Toth (Jira)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/PHOENIX-6771?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Istvan Toth resolved PHOENIX-6771.
----------------------------------
    Fix Version/s: connectors-6.0.0
                   5.2.0
                   queryserver-6.0.1
                   thirdparty-2.0.1
       Resolution: Fixed

> Allow only "squash and merge" from GitHub UI
> --------------------------------------------
>
>                 Key: PHOENIX-6771
>                 URL: https://issues.apache.org/jira/browse/PHOENIX-6771
>             Project: Phoenix
>          Issue Type: Bug
>            Reporter: Istvan Toth
>            Assignee: Istvan Toth
>            Priority: Major
>             Fix For: connectors-6.0.0, 5.2.0, queryserver-6.0.1, thirdparty-2.0.1
>
>
> 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.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)