Commit 77555d8
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 <codebytere@gmail.com>
PR-URL: #35296
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent b50b34b commit 77555d8
1 file changed
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -469,6 +469,12 @@ code. If you wish to create the token yourself in advance, see | |||
| 469 | 469 | ||
| 470 | 470 | ### Technical HOWTO | |
| 471 | 471 | ||
| 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 | + | ||
| 472 | 478 | Clear any `am`/`rebase` that might already be underway: | |
| 473 | 479 | ||
| 474 | 480 | ```text | |
@@ -626,6 +632,8 @@ your pull request shows the purple merged status, | |||
| 626 | 632 | add the "Landed in \<commit hash>..\<commit hash>" comment if you added | |
| 627 | 633 | more than one commit. | |
| 628 | 634 | ||
| 635 | + </details> | ||
| 636 | + | ||
| 629 | 637 | ### Troubleshooting | |
| 630 | 638 | ||
| 631 | 639 | Sometimes, when running `git push upstream master`, you might get an error | |
0 commit comments