diff options
| author | Rich Trott <rtrott@gmail.com> | 2019-03-13 20:10:01 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-03-15 22:14:08 -0700 |
| commit | ee4f32f27ccde8d2c53d9233ff23f48667ee2b89 (patch) | |
| tree | 31b6148625b4b49550b57497c8662cbbbeee902d /COLLABORATOR_GUIDE.md | |
| parent | 5a23a87663cfcf3b6193f5d3095144fb468ca635 (diff) | |
| download | android-node-v8-ee4f32f27ccde8d2c53d9233ff23f48667ee2b89.tar.gz android-node-v8-ee4f32f27ccde8d2c53d9233ff23f48667ee2b89.tar.bz2 android-node-v8-ee4f32f27ccde8d2c53d9233ff23f48667ee2b89.zip | |
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 <ruben@bridgewater.de>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 7 |
1 files changed, 3 insertions, 4 deletions
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. ``` |