diff options
| author | Anna Henningsen <anna@addaleax.net> | 2017-06-17 15:26:15 +0200 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-07-17 14:44:19 -0400 |
| commit | e2abda87f5e3cbcd04f63933cb047f0f4727af0e (patch) | |
| tree | 696136dedcabed7ccc1f8c2b2bb8d0938cbc915b | |
| parent | 24feb333c8fb20880f82076c1be559abb4bf193f (diff) | |
| download | node-new-e2abda87f5e3cbcd04f63933cb047f0f4727af0e.tar.gz | |
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>
| -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 6433eeeacb..20bf03b748 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`. |