From b96d3171a2fca75212a4a8044aed20c6f032e4c2 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Mon, 12 Jun 2023 18:21:33 +0200 Subject: [PATCH] Small fix to cherry-pick instructions (#6997) It wasn't creating the branch --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 010842a5f..66d026b8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -223,7 +223,7 @@ Any other SQL you can put directly in the main sql file, e.g. 1. Check out the release branch that you want to backport to `git checkout release-11.3` 2. Make sure you have the latest changes `git pull` -3. Create a new release branch with a unique name `git checkout release-11.3-` +3. Create a new release branch with a unique name `git checkout -b release-11.3-` 4. Cherry-pick the commit that you want to backport `git cherry-pick -x ` (the `-x` is important) 5. Push the branch `git push` 6. Wait for tests to pass