Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suggest using `git cherry-pick` instead of `hub am -3` in release docs (https://github.com/woocommerce/woocommerce-blocks/pull/1844) 

* Suggest using `git cherry-pick` instead of `hub am -3` in release docs

* Suggest using hub cherry-pick instead of git cherry-pick
This commit is contained in:
Albert Juhé Lluveras 2020-03-03 13:38:50 +01:00 committed by GitHub
parent e97ffd2821
commit 3702098ecf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-blocks/docs/releases/readme.md
View File

@ -47,7 +47,7 @@ _Outcome_: **Team is aware of release and in agreement about what fixes & featur
- Ensure your local checkout is updated to the tip of the release branch.
- For _patch_ releases, cherry pick relevant PRs into the release branch:
- If PR is already labelled `status: cherry-picked 🍒` then continue to next PR.
- Ideally, use GitHub Hub to cherry pick the PR - `hub am -3 {http://URL-TO-PR}`.
- Ideally, use GitHub Hub to cherry pick the PR - `hub cherry-pick {PR-COMMIT-URL}`.
- If there are serious conflicts or extensive differences between `master` and release branch, you may need to take more care:
- Manually cherry pick individual commits using git - `git cherry-pick {COMMIT-HASH}`.
- Or in some cases, manually craft a new PR with appropriate changes, targeting release branch.