SG to use merge button On Mon, 24 Aug 2026 at 18:13, Wenchen Fan <[email protected]> wrote:
> +1, the spark-website PRs do not need JIRA tickets so the merge > script does not buy much, plus we already push commits directly in the > Spark release scripts. > > On Sun, Aug 23, 2026 at 11:41 PM Uroš Bojanić <[email protected]> wrote: > >> +1 for both! >> >> Of the last ~300 commits on asf-site, PR merges split roughly: 51% GitHub >> squash button + 46% script + 3% rebase. Also, about 18% of commits are >> release docs pushed straight to asf-site with no PR, but we're not really >> discussing that flow here at this time anyways. >> >> Regarding the script, yeah let's just delete it. It doesn't seem to add >> any real value here. Of course, let's also make sure to update the repo's >> squash settings properly, so we get a uniform and consistent history. Thank >> you for the proposal Nick! Please ping for PR review. >> >> On 2026/08/23 14:52:42 Nicholas Chammas wrote: >> > spark-website <https://github.com/apache/spark-website> has a merge >> script <https://github.com/apache/spark-website/blob/asf-site/merge_pr.py>. >> It hasn’t been updated in 7 years. >> > >> > We still use the script, but we also often just merge PRs using >> GitHub’s merge button < >> https://github.com/apache/spark-website/pulls?q=is:pr+is:merged>. >> > >> > It seems we don’t really need a merge script for this repo. It would be >> better to have only one way to merge PRs. >> > >> > I suggest that: >> > 1. We delete the script. >> > 2. Update the repo settings to allow "squash and merge” only, where the >> squashed commit title and message are taken from the PR title and >> description. (Currently, "rebase and merge” is also allowed.) >> > >> > I can take care of this. Wanted to get feedback from you all before >> doing so. >> > >> > Nick >> > >> > >> >> --------------------------------------------------------------------- >> To unsubscribe e-mail: [email protected] >> >>
