[
https://issues.apache.org/jira/browse/PHOENIX-6771?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17580382#comment-17580382
]
Istvan Toth commented on PHOENIX-6771:
--------------------------------------
I agree that rebase is sometimes useful, [~gjacoby].
IMO it's minimal extra effort to handle those rare cases manually via git
natively, but disabling rebase in the UI prevents mistakes in the simple cases.
If you disagree, feel free to re-enable rebase from thu UI.
(By natively, I mean doing the rebase locally, and using "git push" to the main
apache github / gitbox repo)
> 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)
