From 7096dd334f32116aa322c32c2a26ddd18fbdb99c Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 13 Mar 2019 20:10:01 -0700 Subject: [PATCH 1/2] doc: update copy/paste error message in Troubleshooting In the Troubleshooting portion of the Collaborator Guide, there is a copy/pasted error message. The message is out of date. More recent git contains a more concise and clear message. Update the text to reflect the current git error message. --- COLLABORATOR_GUIDE.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index dd72b48582d849..9cb5319d39c7fe 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -603,10 +603,9 @@ like this: To https://github.com/nodejs/node ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/nodejs/node' -hint: Updates were rejected because the remote contains work that you do -hint: not have locally. This is usually caused by another repository pushing -hint: to the same ref. You may want to first integrate the remote changes -hint: (e.g. 'git pull ...') before pushing again. +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. Integrate the remote changes (e.g. +hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ``` From 584441210200c1f7c71fe3893b6bbaf1669e398f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 13 Mar 2019 20:14:26 -0700 Subject: [PATCH 2/2] 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. --- COLLABORATOR_GUIDE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 9cb5319d39c7fe..f8d3629eaf6721 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