Skip to content

Commit

Permalink
doc: simplify Troubleshooting text
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-By: Vse Mozhet Byt <[email protected]>
  • Loading branch information
Trott authored and targos committed Mar 27, 2019
1 parent aceae14 commit b3ef1c9
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b3ef1c9

Please sign in to comment.