Skip to content

Commit 895832c

Browse files
committed
doc: put landing specifics in details tag
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 <[email protected]> PR-URL: #35296 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 785a5f9 commit 895832c

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

doc/guides/collaborator-guide.md

+8
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,12 @@ code. If you wish to create the token yourself in advance, see
469469

470470
### Technical HOWTO
471471

472+
Infrequently, it is necessary to manually perform the steps required to land a
473+
pull request rather than rely on `git-node`.
474+
475+
<details>
476+
<Summary>Manual Landing Steps</Summary>
477+
472478
Clear any `am`/`rebase` that might already be underway:
473479

474480
```text
@@ -626,6 +632,8 @@ your pull request shows the purple merged status,
626632
add the "Landed in \<commit hash>..\<commit hash>" comment if you added
627633
more than one commit.
628634

635+
</details>
636+
629637
### Troubleshooting
630638

631639
Sometimes, when running `git push upstream master`, you might get an error

0 commit comments

Comments
 (0)