nchammas commented on code in PR #707: URL: https://github.com/apache/spark-website/pull/707#discussion_r3853178456
########## committers.md: ########## @@ -245,31 +245,11 @@ Once a PR is merged please leave a comment on the PR stating which branch(es) it <h4>Merging website pull requests</h4> -Pull requests to the Spark website (the -<a href="https://github.com/apache/spark-website";>apache/spark-website</a> 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. +Pull requests to the [Spark website repo](https://github.com/apache/spark-website) are merged separately from the [main Spark repo](https://github.com/apache/spark). Unlike the main repo, the website uses `asf-site` as its default branch; there is no `master` branch. -Website PRs are merged using the -<a href="https://github.com/apache/spark-website/blob/asf-site/merge_pr.py";>merge_pr.py</a> 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. +The website repo does not use a merge script. Instead, use GitHub's "Squash and merge" button to merge PRs. -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 -`[email protected]: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. - -<h3>Policy on backporting bug fixes</h3> +## Policy on backporting bug fixes Review Comment: Whoops, that was inadvertent. (Part of a separate, upcoming PR.) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
