From 7d6d859616ab5c49059986339e5d473908b29a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Tue, 23 Jul 2019 13:58:12 +0200 Subject: [PATCH] Updated Scrapy release procedure (markdown) --- Scrapy-release-procedure.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Scrapy-release-procedure.md b/Scrapy-release-procedure.md index 56663d4..dcea69e 100644 --- a/Scrapy-release-procedure.md +++ b/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).