Skip to content

doc: add suggestion to use --3way#12510

Closed
mhdawson wants to merge 3 commits intonodejs:masterfrom
mhdawson:collabg
Closed

doc: add suggestion to use --3way#12510
mhdawson wants to merge 3 commits intonodejs:masterfrom
mhdawson:collabg

Conversation

@mhdawson
Copy link
Member

@mhdawson mhdawson commented Apr 19, 2017

The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail. Add text to suggest how to handle this
by adding the --3way option.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

doc

@mhdawson
doc: add suggestion to use --3way
dfb1b85 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.
@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to the documentations. label Apr 19, 2017
@mhdawson mhdawson self-assigned this Apr 19, 2017
Fishrock123
Fishrock123 reviewed Apr 19, 2017
View reviewed changes
COLLABORATOR_GUIDE.md Outdated
be required. In this case try:

```text
$ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --3way --whitespace=fix
Copy link
Contributor

@Fishrock123 Fishrock123 Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe shorten to just -3?

Copy link
Member Author

@mhdawson mhdawson Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed commit to change to -3

benjamingr
benjamingr approved these changes Apr 19, 2017
View reviewed changes
Copy link
Member

@benjamingr benjamingr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, also this could have saved me time when I started :)

@mscdex mscdex added the meta Issues and PRs related to the general management of the project. label Apr 19, 2017
@Trott
Copy link
Member

Trott commented Apr 20, 2017

There is an "If git am fails" section of onboarding_extras.md that includes this suggestion. To avoid duplication, it might be a good idea to review the rest of that (short) section to see if anything else should be included here, and then remove it from onboarding_extras.md. (That file seems like largely a hodge-podge anyway and the contents should probably be moved to more logical places like this.)

@mhdawson
Copy link
Member Author

mhdawson commented Apr 20, 2017

@Trott pushed commit to address comments.

@mhdawson
Copy link
Member Author

mhdawson commented Apr 21, 2017

CI Run: https://ci.nodejs.org/job/node-test-pull-request/7568/

@mhdawson
Copy link
Member Author

mhdawson commented Apr 21, 2017

CI good, landed as 1159a71

@mhdawson mhdawson closed this Apr 21, 2017
mhdawson added a commit that referenced this pull request Apr 21, 2017
@mhdawson
doc: add suggestion to use --3way
1159a71 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
evanlucas pushed a commit that referenced this pull request Apr 25, 2017
@mhdawson @evanlucas
doc: add suggestion to use --3way
b227574 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@evanlucas evanlucas mentioned this pull request May 1, 2017
Merged
evanlucas pushed a commit that referenced this pull request May 1, 2017
@mhdawson @evanlucas
doc: add suggestion to use --3way
9dcc5dc 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
evanlucas pushed a commit that referenced this pull request May 2, 2017
@mhdawson @evanlucas
doc: add suggestion to use --3way
4276c21 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
gibfahn pushed a commit that referenced this pull request May 16, 2017
@mhdawson @gibfahn
doc: add suggestion to use --3way
8bca711 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 18, 2017
@mhdawson @MylesBorins
doc: add suggestion to use --3way
928382d 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: #12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
@MylesBorins MylesBorins mentioned this pull request May 23, 2017
Merged
@mhdawson mhdawson deleted the collabg branch June 28, 2017 19:24
andrew749 pushed a commit to michielbaird/node that referenced this pull request Jul 19, 2017
@mhdawson @andrew749
doc: add suggestion to use --3way
9621bfd 
The CI seems to do a 3way merge so it is possible
that even though the CI passed, the existing git am command
may fail.  Add text to suggest how to handle this
by adding the --3way option.

PR-URL: nodejs/node#12510
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnell jasnell jasnell approved these changes

@Trott Trott Trott approved these changes

@benjamingr benjamingr benjamingr approved these changes

+2 more reviewers

@Fishrock123 Fishrock123 Fishrock123 left review comments

@gibfahn gibfahn gibfahn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mhdawson mhdawson

Labels

doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@mhdawson @Trott @jasnell @Fishrock123 @benjamingr @gibfahn @mscdex @nodejs-github-bot