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