mirror of https://github.com/scrapy/scrapy.git
Updated Scrapy release procedure (markdown)
parent
cb8c8b61c7
commit
4887b03d0a
|
|
@ -139,9 +139,9 @@ Alternatively, you can wait for https://github.com/regro-cf-autotick-bot to crea
|
|||
such a pull request, and just edit it as needed (you should be able to commit directly to
|
||||
it, even though the GitHub online editor).
|
||||
|
||||
## Cherry-pick into master
|
||||
## Merge into the main branch
|
||||
|
||||
If you’ve released a patch version, you should cherry-pick the required commits into master (exclude version-bumping changes).
|
||||
If you’ve released a patch version, you should merge its branch into the main branch, making sure you exclude version-bumping changes (`git merge --no-commit`).
|
||||
|
||||
## Upgrade CI packages
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue