Skip to content

Commit

Permalink
doc: explain what to do if git push is rejected
Browse files Browse the repository at this point in the history
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream
master` is rejected.

Fixes: #12628
  • Loading branch information
Trott committed Aug 16, 2017
1 parent 1fe0741 commit 514c936
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,33 @@ your pull request shows the purple merged status then you should still
add the "Landed in <commit hash>..<commit hash>" comment if you added
multiple commits.

### Troubleshooting

Sometimes, when running `git push upstream master`, you may get an error message
like this:

```console
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: 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, fetch, rebase, run the tests again (to make sure no interactions
between your changes and the new changes cause any problems), and push again:

```sh
git fetch upstream
git rebase upstream/master
make -j4 test
git push upstream master
```

### I Just Made a Mistake

* Ping a CTC member.
Expand Down

0 comments on commit 514c936

Please sign in to comment.