From b4f4142e8df6e91f173a708e858df5215e3909d3 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 8 May 2023 16:06:00 -0700 Subject: [PATCH] RELEASING.md: Include version number in release branch name This makes it easier to manage multiple patch releases in-flight simultaneously and improves the default PR description. --- RELEASING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 9bd20035db..18a014df45 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -99,7 +99,7 @@ Tagging the Release ```bash $ git checkout v$MAJOR.$MINOR.x $ git pull upstream v$MAJOR.$MINOR.x - $ git checkout -b release + $ git checkout -b release-v$MAJOR.$MINOR.$PATCH # Bump documented gRPC versions. # Also update protoc version to match protobuf version in gradle/libs.versions.toml. @@ -135,7 +135,7 @@ Tagging the Release ```bash $ git checkout v$MAJOR.$MINOR.x - $ git merge --ff-only release + $ git merge --ff-only release-v$MAJOR.$MINOR.$PATCH $ git push upstream v$MAJOR.$MINOR.x $ git push upstream v$MAJOR.$MINOR.$PATCH ```