0
0
mirror of https://github.com/nodejs/node.git synced 2024-12-01 16:10:02 +01:00

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: https://github.com/nodejs/node/pull/13742
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
This commit is contained in:
Anna Henningsen 2017-06-17 15:26:15 +02:00
parent 3d0ef56264
commit d1027695b8
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF

View File

@ -253,7 +253,7 @@ PR-URL: <full URL to your release proposal PR>
This sets up the branch so that nightly builds are produced with the next version number _and_ a pre-release tag.
Merge your release branch into the stable branch that you are releasing from (not master).
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.
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`.