From 895832cdbfc33d44da519f0265c3dc5bf2682f90 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 25 Sep 2020 07:51:23 -0700 Subject: [PATCH] doc: put landing specifics in details tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Showing all the steps isn't usually useful and makes it seem like the collaborator is meant to follow the manual steps. I've seen this happen during at least one onboarding. The section is also a bit long to comfortably scroll over quickly to find the next section. Let's put those steps in a details block to make it more obvious that it is there for unusual situations only. Co-authored-by: Shelley Vohr PR-URL: https://github.com/nodejs/node/pull/35296 Reviewed-By: Michaël Zasso Reviewed-By: Richard Lau Reviewed-By: Michael Dawson --- doc/guides/collaborator-guide.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/guides/collaborator-guide.md b/doc/guides/collaborator-guide.md index 6f408783449ae0..b6080292713fdd 100644 --- a/doc/guides/collaborator-guide.md +++ b/doc/guides/collaborator-guide.md @@ -469,6 +469,12 @@ code. If you wish to create the token yourself in advance, see ### Technical HOWTO +Infrequently, it is necessary to manually perform the steps required to land a +pull request rather than rely on `git-node`. + +
+Manual Landing Steps + Clear any `am`/`rebase` that might already be underway: ```text @@ -626,6 +632,8 @@ your pull request shows the purple merged status, add the "Landed in \..\" comment if you added more than one commit. +
+ ### Troubleshooting Sometimes, when running `git push upstream master`, you might get an error