From 8c02f1ffde205ab17921353f149bb56b59396b71 Mon Sep 17 00:00:00 2001 From: Szehon Ho Date: Wed, 3 Jun 2026 13:04:25 -0700 Subject: [PATCH] Document how to merge website pull requests on the Committers page The Committers page only described merging PRs for the main apache/spark repo. Add a "Merging website pull requests" subsection explaining that spark-website PRs are merged with this repo's merge_pr.py script, that the default branch is asf-site (there is no master branch), how to set up the apache/apache-github remotes, and the reminder to include the regenerated site/ HTML. --- committers.md | 26 ++++++++++++++++++++++++++ site/committers.html | 25 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/committers.md b/committers.md index 1cf633807b..f3dad04d22 100644 --- a/committers.md +++ b/committers.md @@ -244,6 +244,32 @@ can do this automatically in most cases. Once a PR is merged please leave a comment on the PR stating which branch(es) it has been merged with. +

Merging website pull requests

+ +Pull requests to the Spark website (the +apache/spark-website repository) are merged +separately from the main Spark repo. Unlike `apache/spark`, this repository uses `asf-site` as its +default branch, and there is no `master` branch. + +Website PRs are merged using the +merge_pr.py script +in the root of the `spark-website` repository, which squashes the pull request's changes into one +commit, just like `merge_spark_pr.py` does for the main repo. + +To use it, set up remotes in your local clone of `spark-website` the same way as for the main repo: +an `apache` remote (the default `PUSH_REMOTE_NAME`, used for pushing the squashed commit) and an +`apache-github` remote (the default `PR_REMOTE_NAME`, used for pulling the change), both pointing at +`git@github.com:apache/spark-website.git`. Then run the script from the repository root: + +``` +./merge_pr.py +``` + +The script is interactive and walks you through selecting the PR and pushing the merge to the +`asf-site` branch. Before merging, make sure the pull request includes the regenerated HTML under +`site/` in addition to the Markdown/HTML source changes; see the repository's `README.md` for how +the site is built. +

Policy on backporting bug fixes

From `pwendell`: diff --git a/site/committers.html b/site/committers.html index cbf3e37f2a..428204f90b 100644 --- a/site/committers.html +++ b/site/committers.html @@ -708,6 +708,31 @@

Merge script

Once a PR is merged please leave a comment on the PR stating which branch(es) it has been merged with.

+

Merging website pull requests

+ +

Pull requests to the Spark website (the +apache/spark-website repository) are merged +separately from the main Spark repo. Unlike apache/spark, this repository uses asf-site as its +default branch, and there is no master branch.

+ +

Website PRs are merged using the +merge_pr.py script +in the root of the spark-website repository, which squashes the pull request’s changes into one +commit, just like merge_spark_pr.py does for the main repo.

+ +

To use it, set up remotes in your local clone of spark-website the same way as for the main repo: +an apache remote (the default PUSH_REMOTE_NAME, used for pushing the squashed commit) and an +apache-github remote (the default PR_REMOTE_NAME, used for pulling the change), both pointing at +git@github.com:apache/spark-website.git. Then run the script from the repository root:

+ +
./merge_pr.py
+
+ +

The script is interactive and walks you through selecting the PR and pushing the merge to the +asf-site branch. Before merging, make sure the pull request includes the regenerated HTML under +site/ in addition to the Markdown/HTML source changes; see the repository’s README.md for how +the site is built.

+

Policy on backporting bug fixes

From pwendell: