Skip to content

Commit

Permalink
doc: add backport-open-vN.x step to backporting guide
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
LiviaMedeiros authored and targos committed Jul 12, 2022
1 parent c6396c1 commit 54a8a0c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions doc/contributing/backporting-to-release-lines.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<pr base branch>`)

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
Expand Down

0 comments on commit 54a8a0c

Please sign in to comment.