Skip to content

Commit

Permalink
Clarify that we should rebase the branch when preparing the npm relea…
Browse files Browse the repository at this point in the history
…se branches (#14260)
  • Loading branch information
youknowriad committed Mar 20, 2019
1 parent 127baea commit de08f22
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/contributors/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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.

Expand Down

0 comments on commit de08f22

Please sign in to comment.