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

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
7 participants
@Trott
Member

Trott commented Aug 16, 2017

In COLLABORATOR_GUIDE.md, explain what to do if git push upstream master is rejected.

Fixes: #12628

Checklist
Affected core subsystem(s)

doc

doc: explain what to do if git push is rejected
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream
master` is rejected.

Fixes: #12628
@TimothyGu

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:

This comment has been minimized.

@TimothyGu

TimothyGu Aug 16, 2017

Member

Usually I'd say rerunning CI after rebase is pretty important too.

@TimothyGu

TimothyGu Aug 16, 2017

Member

Usually I'd say rerunning CI after rebase is pretty important too.

This comment has been minimized.

@targos

targos Aug 16, 2017

Member

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).

@targos

targos Aug 16, 2017

Member

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).

@targos

targos approved these changes Aug 16, 2017

@Trott

This comment has been minimized.

Show comment
Hide comment
@Trott

Trott Aug 18, 2017

Member

Landed in d15a5c0

Member

Trott commented Aug 18, 2017

Landed in d15a5c0

@Trott Trott closed this Aug 18, 2017

Trott added a commit to Trott/io.js that referenced this pull request Aug 18, 2017

doc: explain what to do if git push is rejected
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>

MylesBorins added a commit that referenced this pull request Sep 10, 2017

doc: explain what to do if git push is rejected
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream
master` is rejected.

PR-URL: #14848
Fixes: #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>

@MylesBorins MylesBorins referenced this pull request Sep 10, 2017

Merged

v8.5.0 proposal #15308

MylesBorins added a commit that referenced this pull request Sep 12, 2017

doc: explain what to do if git push is rejected
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream
master` is rejected.

PR-URL: #14848
Fixes: #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>

MylesBorins added a commit that referenced this pull request Sep 20, 2017

doc: explain what to do if git push is rejected
In COLLABORATOR_GUIDE.md, explain what to do if `git push upstream
master` is rejected.

PR-URL: #14848
Fixes: #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>

@MylesBorins MylesBorins referenced this pull request Sep 20, 2017

Merged

v6.11.4 proposal #15506

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment