From 685be32e04fc8550bf888955131cdc9c6bf165a2 Mon Sep 17 00:00:00 2001
From: Banks Nussman <banks@nussman.us>
Date: Wed, 9 Aug 2023 23:33:38 -0400
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=80=20add=20deploy=20github=20acti?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 00000000..b3d0e6f7
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,23 @@
+name: deploy
+
+on: 
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set Git config
+      run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "Github Actions"
+    - name: Merge main into production
+      run: |
+          git fetch
+          git switch main
+          git pull
+          git switch production
+          git pull
+          git merge main -y
+          git push origin production
\ No newline at end of file

From c1924902adafbb4137d91daecf8ab9ee513905d8 Mon Sep 17 00:00:00 2001
From: Banks Nussman <banks@nussman.us>
Date: Wed, 9 Aug 2023 23:35:47 -0400
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=80=20fix=20deploy=20github=20acti?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b3d0e6f7..2c350aa5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,5 +19,5 @@ jobs:
           git pull
           git switch production
           git pull
-          git merge main -y
+          git merge main
           git push origin production
\ No newline at end of file