Skip to content

Commit 22de2cf

Browse files
committedMar 16, 2019
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: nodejs#26652 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
1 parent ee4f32f commit 22de2cf

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed
 

‎COLLABORATOR_GUIDE.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,8 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
610610
```
611611

612612
That means a commit has landed since your last rebase against `upstream/master`.
613-
To fix this, pull with rebase from upstream and run the tests again (to make
614-
sure no interactions between your changes and the new changes cause any
615-
problems), and push again:
613+
To fix this, pull with rebase from upstream, run the tests again, and (if the
614+
tests pass) push again:
616615

617616
```sh
618617
git pull upstream master --rebase

0 commit comments

Comments
 (0)