doc: explain what to do if git push is rejected #14848
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream master` is rejected. Fixes: nodejs#12628
TimothyGu
reviewed
Aug 16, 2017
|
|
||
| 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: |
There was a problem hiding this comment.
Usually I'd say rerunning CI after rebase is pretty important too.
There was a problem hiding this comment.
I disagree. IMO a local test run will almost always catch an issue (and if we wanted to suggest running CI after a rebase, we would do it above for all cases, not just for race conditions).
jasnell
approved these changes
Aug 16, 2017
hiroppy
approved these changes
Aug 16, 2017
targos
approved these changes
Aug 16, 2017
|
Landed in d15a5c0 |
Trott
added a commit
to Trott/io.js
that referenced
this pull request
Aug 18, 2017
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream master` is rejected. PR-URL: nodejs#14848 Fixes: nodejs#12628 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In COLLABORATOR_GUIDE.md, explain what to do if
git push upstream masteris rejected.Fixes: #12628
Checklist
Affected core subsystem(s)
doc