@@ -31,9 +31,9 @@ release line. All commands will use the `v10.x-staging` branch as the target
31
31
branch. In order to submit a backport pull request to another branch, simply
32
32
replace that with the staging branch for the targeted release line.
33
33
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.
37
37
38
38
``` shell
39
39
# 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.
68
68
using ` git add` , and then commit the changes. That can be done with
69
69
` git cherry-pick --continue` .
70
70
6. 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
72
72
the commit, but this will be done later.
73
73
7. Make sure ` make -j4 test` passes.
74
- 8. Push the changes to your fork
74
+ 8. Push the changes to your fork.
75
75
9. Open a pull request:
76
76
1. Be sure to target the ` v10.x-staging` branch in the pull request.
77
77
1. Include the backport target in the pull request title in the following
78
78
format: ` [v10.x backport] < commit title> ` .
79
79
Example: ` [v10.x backport] process: improve performance of nextTick`
80
80
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 .
82
82
1. Amend the commit message and include a ` Backport-PR-URL:` metadata and
83
83
re-push the change to your fork.
84
84
1. Run a [` node-test-pull-request` ][] CI job (with ` REBASE_ONTO` set to the
85
85
default ` < pr base branch> ` )
86
86
10. If during the review process conflicts arise, use the following to rebase:
87
87
` git pull --rebase upstream v10.x-staging`
88
88
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` .
91
91
92
92
[Release Schedule]: https://github.com/nodejs/Release#release-schedule1
93
93
[Release Plan]: https://github.com/nodejs/Release#release-plan
0 commit comments