Skip to content

Commit 57b7285

Browse files
committed
doc: mention rebasing of v?.x-staging post release
Mention that the staging branch should be rebased on top of the release branch after merging a release proposal. PR-URL: #13742 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>
1 parent 3322191 commit 57b7285

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

doc/releases.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ PR-URL: <full URL to your release proposal PR>
253253

254254
This sets up the branch so that nightly builds are produced with the next version number _and_ a pre-release tag.
255255

256-
Merge your release branch into the stable branch that you are releasing from (not master).
256+
Merge your release proposal branch into the stable branch that you are releasing from (e.g. `v8.x`), and rebase the corresponding staging branch (`v8.x-staging`) on top of that.
257257

258258
Cherry-pick the release commit to `master`. After cherry-picking, edit `src/node_version.h` to ensure the version macros contain whatever values were previously on `master`. `NODE_VERSION_IS_RELEASE` should be `0`.
259259

0 commit comments

Comments
 (0)