From 49c92ccb009cd265271a9f765852f419937d1f7a Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Thu, 7 Mar 2019 09:22:37 +0100 Subject: [PATCH] Clarify that we should rebase the branch when preparing the npm release branches (#14260) --- docs/contributors/release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributors/release.md b/docs/contributors/release.md index fb31bbb4d6a25e..d19f1664dc12f2 100644 --- a/docs/contributors/release.md +++ b/docs/contributors/release.md @@ -200,7 +200,7 @@ For each Gutenberg plugin release, WordPress trunk should be synchronized with t 1. Ensure the WordPress `trunk` branch is open for enhancements. 2. Check out the last published Gutenberg release branch `git checkout release/x.x` 3. Create a Pull Request from this branch targetting `wp/trunk`. -4. Merge the Pull Request. +4. Merge the Pull Request using the "Rebase and Merge" button to keep the history of the commits. Now, the branch is ready to be used to publish the npm packages. @@ -222,7 +222,7 @@ The following workflow is needed when bug fixes or security releases need to be 1. Cherry-pick 2. Check out the last published Gutenberg release branch `git checkout release/x.x` 3. Create a Pull Request from this branch targetting the WordPress related major branch (Example `wp/5.2`). -4. Merge the Pull Request. +4. Merge the Pull Request using the "Rebase and Merge" button to keep the history of the commits. Now, the branch is ready to be used to publish the npm packages.