diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index dd72b48582d849..f8d3629eaf6721 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -603,17 +603,15 @@ 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. ``` 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