Updated Scrapy release procedure (markdown)

Adrián Chaves 2022-07-25 13:45:23 +02:00
parent cb8c8b61c7
commit 4887b03d0a
1 changed files with 2 additions and 2 deletions

@ -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 youve released a patch version, you should cherry-pick the required commits into master (exclude version-bumping changes).
If youve 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