From d1027695b86776c2df8e9aa0a60ee918a69967e7 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 17 Jun 2017 15:26:15 +0200 Subject: [PATCH] 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 Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Michael Dawson Reviewed-By: Gibson Fahnestock --- doc/releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: 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`.