attilapiros commented on a change in pull request #329: URL: https://github.com/apache/spark-website/pull/329#discussion_r600550375
########## File path: committers.md ########## @@ -169,20 +169,21 @@ To use the `merge_spark_pr.py` script described below, you will need to add a git remote called `apache` at `https://github.com/apache/spark`, as well as one called `apache-github` at `git://github.com/apache/spark`. -You will likely also have a remote `origin` pointing to your fork of Spark, and -`upstream` pointing to the `apache/spark` GitHub repo. +The `apache` (the default value of `PUSH_REMOTE_NAME` environment variable) is the remote used for pushing the squashed commits +and `apache-github` (default value of `PR_REMOTE_NAME`) is the remote used for pulling the changes. +By using two separate remotes for these two actions the result of the `merge_spark_pr.py` can be tested without pushing it +into the official Spark repo just by specifying your fork in the `PUSH_REMOTE_NAME` variable. -If correct, your `git remote -v` should look like: +After cloning your fork of Spark you already have a remote `origin` pointing there. So if correct, your `git remote -v` +contains at least these lines: ``` -apache https://github.com/apache/spark.git (fetch) -apache https://github.com/apache/spark.git (push) -apache-github git://github.com/apache/spark (fetch) -apache-github git://github.com/apache/spark (push) -origin https://github.com/[your username]/spark.git (fetch) -origin https://github.com/[your username]/spark.git (push) -upstream https://github.com/apache/spark.git (fetch) -upstream https://github.com/apache/spark.git (push) +apache [email protected]:apache/spark-website.git (fetch) +apache [email protected]:apache/spark-website.git (push) +apache-github [email protected]:apache/spark-website.git (fetch) +apache-github [email protected]:apache/spark-website.git (push) +origin [email protected]:[your username]/spark-website.git (fetch) +origin [email protected]:[your username]/spark-website.git (push) Review comment: I focused on the first commit which is writing your name on the website :). -- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
