@@ -31,9 +31,9 @@ release line. All commands will use the `v10.x-staging` branch as the target
3131branch. In order to submit a backport pull request to another branch, simply
3232replace that with the staging branch for the targeted release line.
3333
34- 1 . Checkout the staging branch for the targeted release line
35- 2 . Make sure that the local staging branch is up to date with the remote
36- 3 . Create a new branch off of the staging branch
34+ 1 . Checkout the staging branch for the targeted release line.
35+ 2 . Make sure that the local staging branch is up to date with the remote.
36+ 3 . Create a new branch off of the staging branch, as shown below.
3737
3838 ``` shell
3939 # Assuming your fork of Node.js is checked out in $NODE_DIR,
@@ -68,26 +68,26 @@ replace that with the staging branch for the targeted release line.
6868 using ` git add` , and then commit the changes. That can be done with
6969 ` git cherry-pick --continue` .
70706. Leave the commit message as is. If you think it should be modified, comment
71- in the Pull Request . The ` Backport-PR-URL` metadata does need to be added to
71+ in the pull request . The ` Backport-PR-URL` metadata does need to be added to
7272 the commit, but this will be done later.
73737. Make sure ` make -j4 test` passes.
74- 8. Push the changes to your fork
74+ 8. Push the changes to your fork.
75759. Open a pull request:
7676 1. Be sure to target the ` v10.x-staging` branch in the pull request.
7777 1. Include the backport target in the pull request title in the following
7878 format: ` [v10.x backport] < commit title> ` .
7979 Example: ` [v10.x backport] process: improve performance of nextTick`
8080 1. Check the checkbox labeled " Allow edits from maintainers" .
81- 1. In the description add a reference to the original PR .
81+ 1. In the description add a reference to the original pull request .
8282 1. Amend the commit message and include a ` Backport-PR-URL:` metadata and
8383 re-push the change to your fork.
8484 1. Run a [` node-test-pull-request` ][] CI job (with ` REBASE_ONTO` set to the
8585 default ` < pr base branch> ` )
868610. If during the review process conflicts arise, use the following to rebase:
8787 ` git pull --rebase upstream v10.x-staging`
8888
89- After the PR lands replace the ` backport-requested-v10.x` label on the original
90- PR with ` backported-to-v10.x` .
89+ After the pull request lands, replace the ` backport-requested-v10.x` label
90+ on the original pull request with ` backported-to-v10.x` .
9191
9292[Release Schedule]: https://github.com/nodejs/Release#release-schedule1
9393[Release Plan]: https://github.com/nodejs/Release#release-plan
0 commit comments