Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: add backport-open-vN.x step to backporting guide #43590

Merged
merged 1 commit into from
Jun 29, 2022
Merged

doc: add backport-open-vN.x step to backporting guide #43590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions doc/contributing/backporting-to-release-lines.md
View file
Open in desktop
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