1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: simplify Troubleshooting text

Browse Source 
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>
This commit is contained in:
Rich Trott 2019-03-13 20:14:26 -07:00
parent ee4f32f27c
commit 22de2cfb71
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
COLLABORATOR_GUIDE.md
View File

@ -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