diff options
| author | Michael Dawson <michael_dawson@ca.ibm.com> | 2017-04-19 16:12:08 +0300 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2017-04-21 18:47:48 +0300 |
| commit | 1159a717fc91e4350e8fdb2cfd08815c55f96c11 (patch) | |
| tree | d198796415896d56142bb481d02f10d1eb913cff /COLLABORATOR_GUIDE.md | |
| parent | c083a200b07f998649b52d80ff653219a691d0e2 (diff) | |
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 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index c7939e6eacc..16d8e205ff5 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -372,6 +372,18 @@ Apply external patches $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fix ``` +If the merge fails even though recent CI runs were successful, then a 3-way merge may +be required. In this case try: + +```text +$ git am --abort +$ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am -3 --whitespace=fix +``` +If the 3-way merge succeeds you can proceed, but make sure to check the changes +against the original PR carefully and build/test on at least one platform +before landing. If the 3-way merge fails, then it is most likely that a conflicting +PR has landed since the CI run and you will have to ask the author to rebase. + Check and re-review the changes ```text |