From 01217a24ac3927d34cb20e015dbdd8cdc27b7195 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 31 May 2023 10:11:31 +0200 Subject: [PATCH] fix(merge.bash): delete the correct branch --- tools/merge.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/merge.bash b/tools/merge.bash index 83e66fc..1616d67 100755 --- a/tools/merge.bash +++ b/tools/merge.bash @@ -2,7 +2,7 @@ set -euxo pipefail git checkout main git remote add golang git@github.com:golang/go.git || git fetch golang -git branch -D golang-upstream golang-http-upstream merged-main || true +git branch -D golang-upstream golang-crypto-upstream merged-main || true git fetch golang git checkout -b golang-upstream $(cat UPSTREAM) git subtree split -P src/crypto/ -b golang-crypto-upstream