From 1159a717fc91e4350e8fdb2cfd08815c55f96c11 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 19 Apr 2017 09:12:08 -0400 Subject: 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 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Rich Trott Reviewed-By: Gibson Fahnestock --- doc/onboarding-extras.md | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'doc') 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 -- cgit v1.2.3