From ee4f32f27ccde8d2c53d9233ff23f48667ee2b89 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 13 Mar 2019 20:10:01 -0700 Subject: 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. PR-URL: https://github.com/nodejs/node/pull/26652 Reviewed-By: Ruben Bridgewater Reviewed-By: Vse Mozhet Byt --- COLLABORATOR_GUIDE.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'COLLABORATOR_GUIDE.md') diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index dd72b48582..9cb5319d39 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. ``` -- cgit v1.2.3