diff options
| author | Rich Trott <rtrott@gmail.com> | 2019-03-13 20:14:26 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-03-15 22:14:10 -0700 |
| commit | 22de2cfb71f3f1ab63e9663f4aa62bd9016b762a (patch) | |
| tree | df1d37cfcd5e7c10452202909b1becd8c4eba8be /COLLABORATOR_GUIDE.md | |
| parent | ee4f32f27ccde8d2c53d9233ff23f48667ee2b89 (diff) | |
| download | android-node-v8-22de2cfb71f3f1ab63e9663f4aa62bd9016b762a.tar.gz android-node-v8-22de2cfb71f3f1ab63e9663f4aa62bd9016b762a.tar.bz2 android-node-v8-22de2cfb71f3f1ab63e9663f4aa62bd9016b762a.zip | |
doc: simplify Troubleshooting text
In the Troubleshooting section of the Collaborator Guide, there is one
particularly lengthy and difficult-to-understand sentence. Make it
shorter and more clear.
PR-URL: https://github.com/nodejs/node/pull/26652
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 9cb5319d39..f8d3629eaf 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -610,9 +610,8 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details. ``` That means a commit has landed since your last rebase against `upstream/master`. -To fix this, pull with rebase from upstream and run the tests again (to make -sure no interactions between your changes and the new changes cause any -problems), and push again: +To fix this, pull with rebase from upstream, run the tests again, and (if the +tests pass) push again: ```sh git pull upstream master --rebase |