Skip to content

Commit

Permalink
fix(merge.bash): delete the correct branch
Browse files Browse the repository at this point in the history
  • Loading branch information
bassosimone authored May 31, 2023
1 parent 506c80f commit 01217a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/merge.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 01217a2

Please sign in to comment.