RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Scrapy release procedure (markdown)

Adrián Chaves 2019-07-23 13:58:12 +02:00
parent e2a4113236
commit 7d6d859616
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Scrapy-release-procedure.md

@ -121,12 +121,6 @@ may take a while depending on the conda-forge build queue. Once builds are OK,
the pull request is ready to merge and packages will be uploaded to the
`conda-forge` channel automatically.
## Merge into master
## Cherry-pick into master
If you’ve released a patch version, you should create a pull request to merge
the branch changes back into `master`.
Because the branch includes version-bumping commits that must not be merged
into master, you will need to create a pull request forked from `master` and
use cherry-pick to include only required commits. Using `git rebase` to drop
undesired commits may also work.
If you’ve released a patch version, you should cherry-pick the required commits into master (exclude version-bumping changes).