From 54a8a0c9c7871e66c16ae76bc51db3ba67c94992 Mon Sep 17 00:00:00 2001 From: Livia Medeiros <74449973+LiviaMedeiros@users.noreply.github.com> Date: Thu, 30 Jun 2022 03:35:41 +0800 Subject: [PATCH] doc: add `backport-open-vN.x` step to backporting guide PR-URL: https://github.com/nodejs/node/pull/43590 Reviewed-By: Antoine du Hamel Reviewed-By: Richard Lau Reviewed-By: Matteo Collina Reviewed-By: Beth Griggs Reviewed-By: Luigi Pinca Reviewed-By: Danielle Adams Reviewed-By: Darshan Sen --- doc/contributing/backporting-to-release-lines.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/contributing/backporting-to-release-lines.md b/doc/contributing/backporting-to-release-lines.md index eebb5a85961f62..d9dea5dbe2b06f 100644 --- a/doc/contributing/backporting-to-release-lines.md +++ b/doc/contributing/backporting-to-release-lines.md @@ -105,11 +105,14 @@ replace that with the staging branch for the targeted release line. 6. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the default ``) -10. If during the review process conflicts arise, use the following to rebase: +10. Replace the `backport-requested-v10.x` label on the original pull request + with `backport-open-v10.x`. + +11. If during the review process conflicts arise, use the following to rebase: `git pull --rebase upstream v10.x-staging` -After the pull request lands, replace the `backport-requested-v10.x` label -on the original pull request with `backported-to-v10.x`. +After the pull request lands, replace the `backport-open-v10.x` label on the +original pull request with `backported-to-v10.x`. [Release Plan]: https://github.com/nodejs/Release#release-plan [Release Schedule]: https://github.com/nodejs/Release#release-schedule