Skip to content

Commit 54a8a0c

Browse files
LiviaMedeirostargos
authored andcommitted
doc: add backport-open-vN.x step to backporting guide
PR-URL: #43590 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com>
1 parent c6396c1 commit 54a8a0c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

doc/contributing/backporting-to-release-lines.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,14 @@ replace that with the staging branch for the targeted release line.
105105
6. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the
106106
default `<pr base branch>`)
107107

108-
10. If during the review process conflicts arise, use the following to rebase:
108+
10. Replace the `backport-requested-v10.x` label on the original pull request
109+
with `backport-open-v10.x`.
110+
111+
11. If during the review process conflicts arise, use the following to rebase:
109112
`git pull --rebase upstream v10.x-staging`
110113

111-
After the pull request lands, replace the `backport-requested-v10.x` label
112-
on the original pull request with `backported-to-v10.x`.
114+
After the pull request lands, replace the `backport-open-v10.x` label on the
115+
original pull request with `backported-to-v10.x`.
113116

114117
[Release Plan]: https://github.com/nodejs/Release#release-plan
115118
[Release Schedule]: https://github.com/nodejs/Release#release-schedule

0 commit comments

Comments
 (0)