diff options
| author | Anna Henningsen <anna@addaleax.net> | 2017-06-17 16:26:15 +0300 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2017-06-21 23:22:49 +0300 |
| commit | d1027695b86776c2df8e9aa0a60ee918a69967e7 (patch) | |
| tree | ed21810d6281e31f1427cdb00d37ff4af352fa77 /doc/releases.md | |
| parent | 3d0ef562640d6dfb8da10653ba2fec3ebcb98cf3 (diff) | |
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>
Diffstat (limited to 'doc/releases.md')
| -rw-r--r-- | doc/releases.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/releases.md b/doc/releases.md index f1f82fdb981..d2dd317fdb4 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -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`. |