Document how to merge website pull requests on the Committers page#695
Closed
szehon-ho wants to merge 1 commit into
Closed
Document how to merge website pull requests on the Committers page#695szehon-ho wants to merge 1 commit into
szehon-ho wants to merge 1 commit into
Conversation
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.
Member
Author
screenshot
|
Member
Author
|
@HyukjinKwon @dongjoon-hyun @gaogaotiantian can you take a look if it makes sense? the first step for new committer was to add the name to the committers page, but i didnt find a good reference how to merge it. (as opposed to merging prs in the main spark repo) |
HyukjinKwon
approved these changes
Jun 3, 2026
Member
Author
|
Merged, thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
The Committers page (
committers.md) currently only documents how to merge pull requests for the mainapache/sparkrepository (themerge_spark_pr.pyscript). It does not explain how a committer merges pull requests to theapache/spark-websiterepository itself.This PR adds a "Merging website pull requests" subsection under "How to merge a pull request" that covers:
merge_pr.pyscript (which squashes commits, likemerge_spark_pr.pydoes for the main repo).asf-siteas its default branch (there is nomasterbranch).apache(PUSH_REMOTE_NAME) andapache-github(PR_REMOTE_NAME) remotes.site/HTML.The generated
site/committers.htmlwas rebuilt withjekyll buildand is included.How was this patch tested?
Built the site locally with
jekyll buildand verified the renderedsite/committers.htmlshows the new section correctly.