From c14a85afb543dab1cb08fae4c5456f2cfa3212ba Mon Sep 17 00:00:00 2001 From: Kelsey Francis Date: Thu, 27 Jun 2024 13:55:26 -0700 Subject: [PATCH] Update release instructions with branch name change --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index f8bb0d6d..ffadcf84 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,7 +6,7 @@ Then go add this version to the `tf-init` script in the monorepo. ``` $ git remote add upstream git@github.com:cyrilgdn/terraform-provider-postgresql.git $ git fetch --all -$ git merge --no-ff upstream/master # resolve conflicts, favoring our previous changes +$ git merge --no-ff upstream/main # resolve conflicts, favoring our previous changes $ git push origin HEAD $ git tag v1.20.0-seq $ git push origin v1.20.0-seq