diff options
| author | Michael Dawson <michael_dawson@ca.ibm.com> | 2017-04-19 09:12:08 -0400 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2017-04-21 11:47:48 -0400 |
| commit | 1159a717fc91e4350e8fdb2cfd08815c55f96c11 (patch) | |
| tree | d198796415896d56142bb481d02f10d1eb913cff /doc/onboarding-extras.md | |
| parent | c083a200b07f998649b52d80ff653219a691d0e2 (diff) | |
| download | android-node-v8-1159a717fc91e4350e8fdb2cfd08815c55f96c11.tar.gz android-node-v8-1159a717fc91e4350e8fdb2cfd08815c55f96c11.tar.bz2 android-node-v8-1159a717fc91e4350e8fdb2cfd08815c55f96c11.zip | |
doc: add suggestion to use --3way
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: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'doc/onboarding-extras.md')
| -rw-r--r-- | doc/onboarding-extras.md | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/onboarding-extras.md b/doc/onboarding-extras.md index 5880536d04..a9f4885501 100644 --- a/doc/onboarding-extras.md +++ b/doc/onboarding-extras.md @@ -103,16 +103,6 @@ to update from nodejs/node: * `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`) -## If `git am` fails - -* if `git am` fails – use `git am --abort` - * this usually means the PR needs updated - * prefer to make the originating user update the code, since they have it fresh in mind -* first, reattempt with `git am -3` (3-way merge)` -* if `-3` still fails, and you need to get it merged: - * `git fetch upstream pull/N/head:pr-N && git checkout pr-N && git rebase master` - - ## best practices * commit often, out to your github fork (origin), open a PR |