From 4887b03d0a37421fbf153d598e5e815b73392dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Mon, 25 Jul 2022 13:45:23 +0200 Subject: [PATCH] Updated Scrapy release procedure (markdown) --- Scrapy-release-procedure.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scrapy-release-procedure.md b/Scrapy-release-procedure.md index a7d380c..9798c2b 100644 --- a/Scrapy-release-procedure.md +++ b/Scrapy-release-procedure.md @@ -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