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: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
nodejs · Apr 17, 2019 · 983ea7f · 983ea7f
1 parent 84db29c
commit 983ea7f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -661,10 +661,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.
 ```