diff options
| author | Ali Ijaz Sheikh <ofrobots@google.com> | 2018-01-24 10:50:50 -0800 |
|---|---|---|
| committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2018-01-30 15:00:42 -0800 |
| commit | 82fd1a7bf9109c84d02200a65bafa89f19cd7d25 (patch) | |
| tree | f0062cf42956ca507a7542c71ffb5767f038a360 /COLLABORATOR_GUIDE.md | |
| parent | 4efde4d0d4934dd8b47c11011e47eb27ad78a7ae (diff) | |
| download | android-node-v8-82fd1a7bf9109c84d02200a65bafa89f19cd7d25.tar.gz android-node-v8-82fd1a7bf9109c84d02200a65bafa89f19cd7d25.tar.bz2 android-node-v8-82fd1a7bf9109c84d02200a65bafa89f19cd7d25.zip | |
doc: reorder section on updating PR branch
It makes more sense to provide instructions on how to update the PR
branch before instructions on pushing the commit.
PR-URL: https://github.com/nodejs/node/pull/18355
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index e00437ee7c..95ef065355 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -596,20 +596,20 @@ Validate that the commit message is properly formatted using $ git rev-list upstream/master...HEAD | xargs core-validate-commit ``` +Optional: When landing your own commits, force push the amended commit to the +branch you used to open the pull request. If your branch is called `bugfix`, +then the command would be `git push --force-with-lease origin master:bugfix`. +When the pull request is closed, this will cause the pull request to +show the purple merged status rather than the red closed status that is +usually used for pull requests that weren't merged. + Time to push it: ```text $ git push upstream master ``` -* Optional: Force push the amended commit to the branch you used to -open the pull request. If your branch is called `bugfix`, then the -command would be `git push --force-with-lease origin master:bugfix`. -When the pull request is closed, this will cause the pull request to -show the purple merged status rather than the red closed status that is -usually used for pull requests that weren't merged. Only do this when -landing your own contributions. -* Close the pull request with a "Landed in `<commit hash>`" comment. If +Close the pull request with a "Landed in `<commit hash>`" comment. If your pull request shows the purple merged status then you should still add the "Landed in <commit hash>..<commit hash>" comment if you added multiple commits. |