From 203bef5515407e2e173447a7e3cbcb8dbc8f69c9 Mon Sep 17 00:00:00 2001 From: Ruy Adorno Date: Wed, 24 Aug 2022 16:29:21 -0400 Subject: [PATCH] doc: note on release guide to update main branch Added an extra command to make sure to remind me (and other releasers) to update the `main` branch _before_ cherry-picking the release commit to the branch. Adding this command will often avoid unnecessary extra-work in case there are mismatches between the local state of the main branch and remote. --- doc/contributing/releases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index eb03be2a07de0e..30333cf1167983 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -683,6 +683,7 @@ repository. ```console $ git checkout main +$ git pull upstream main $ git cherry-pick v1.x^ ```