From fc3552305a7a0b13d4a50092c35bb24168cfc692 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 13 Mar 2019 20:14:26 -0700 Subject: [PATCH] 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 Reviewed-By: Vse Mozhet Byt --- COLLABORATOR_GUIDE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 09470ad101e965..136a9276ab4b8f 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -668,9 +668,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