Skip to content

Commit

Permalink
doc: mention rebasing of v?.x-staging post release
Browse files Browse the repository at this point in the history
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 <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>
  • Loading branch information
addaleax committed Jun 21, 2017
1 parent 3d0ef56 commit d102769
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down

0 comments on commit d102769

Please sign in to comment.