From 3f13f8b9aeb85db6aa6c6d119e2a00e08258a2fd Mon Sep 17 00:00:00 2001
From: chiefmikey <wolfemikl@gmail.com>
Date: Mon, 22 Aug 2022 12:12:28 -0600
Subject: [PATCH] Add beta branch origin/main

---
 beta/beta-branch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml
index 0aff5637..8a055e96 100644
--- a/beta/beta-branch.yml
+++ b/beta/beta-branch.yml
@@ -29,7 +29,7 @@ jobs:
           BRANCH=${GITHUB_REF##*/}
           git config user.name "Mikl Wolfe"
           git config user.email "wolfemikl@gmail.com"
-          git merge --allow-unrelated-histories main || true
+          git merge --allow-unrelated-histories origin/main || true
           git checkout --ours .
           git add .
           git commit -am 'Merge ${BRANCH} with main'