From b7e923606e4b0cada7e7f3a42b977964019bc9f6 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@serverlessops.io>
Date: Mon, 2 Sep 2024 14:29:42 -0400
Subject: [PATCH] see if this works

---
 .github/workflows/main.yaml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 7f9a469..8252490 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -45,13 +45,26 @@ jobs:
       - name: Checkout source
         id: checkout-source
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Merge branch
         id: merge-branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          echo "Configuring git"
           git config user.name "GitHub Actions"
           git config user.email "<>"
-          git branch -v
-          git log
+
+          echo "Checking out branch"
+          git fetch origin v1
+          git checkout v1
+          git reset --hard v1
+
+          echo "Merging branch"
+          git merge --no-ff $GITHUB_REF
+
+          echo "Pushing branch"
+          git push origin v1
+