From 4b89ef3fddf743121a6b1fbf5013eb4f2bc5ca1f Mon Sep 17 00:00:00 2001
From: Elliot Jackson <13633636+elliotmjackson@users.noreply.github.com>
Date: Thu, 22 Dec 2022 09:32:28 -0500
Subject: [PATCH] TCN-875 Resolve sync v1 branch bug (#92)

The last release [failed to sync the v1
branch](https://github.com/bufbuild/buf-setup-action/actions/runs/3758482157/jobs/6386878631)
with main and required manual intervention. I have fixed this bug on a
branch and tested
[here](https://github.com/elliotmjackson/buf-setup-action/actions/runs/3758581064/jobs/6387090474)
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8666300..997541b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -104,7 +104,7 @@ jobs:
         run: |
           git fetch origin
           git switch v1
-          git merge main
+          git merge origin/main
           git push origin v1
       - name: Release
         id: ghr