-
Notifications
You must be signed in to change notification settings - Fork 30k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
doc: explain what to do if git push is rejected #14848
Conversation
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream master` is rejected. Fixes: nodejs#12628
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with one suggestion.
|
||
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usually I'd say rerunning CI after rebase is pretty important too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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).
Landed in d15a5c0 |
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>
In COLLABORATOR_GUIDE.md, explain what to do if
git push upstream master
is rejected.Fixes: #12628
Checklist
Affected core subsystem(s)
doc