diff options
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 |