Skip to content

Commit 983ea7f

Browse files
TrottBethGriggs
authored andcommitted
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]>
1 parent 84db29c commit 983ea7f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

COLLABORATOR_GUIDE.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,9 @@ like this:
661661
To https://github.com/nodejs/node
662662
! [rejected] master -> master (fetch first)
663663
error: failed to push some refs to 'https://github.com/nodejs/node'
664-
hint: Updates were rejected because the remote contains work that you do
665-
hint: not have locally. This is usually caused by another repository pushing
666-
hint: to the same ref. You may want to first integrate the remote changes
667-
hint: (e.g. 'git pull ...') before pushing again.
664+
hint: Updates were rejected because the tip of your current branch is behind
665+
hint: its remote counterpart. Integrate the remote changes (e.g.
666+
hint: 'git pull ...') before pushing again.
668667
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
669668
```
670669

0 commit comments

Comments
 (0)