From a8d16fb092127b20e8959f0a6e43c683eabddd23 Mon Sep 17 00:00:00 2001
From: powe97 <116031952+powe97@users.noreply.github.com>
Date: Sat, 16 Mar 2024 15:56:36 -0400
Subject: [PATCH] Create merge.yml

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

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 000000000..b9510d765
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,32 @@
+name: Merge main into static-generated
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  merge-branches:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout static-generated
+        uses: actions/checkout@v4
+        with:
+          ref: static-generated
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Merge branches manually
+        run: |
+          git config --global user.name "Quatalog Updater"
+          git config --global user.email "github_actions@quatalog.com"
+
+          git checkout main
+          git checkout -b new-static-generated
+          git merge static-generated --allow-unrelated-histories
+          
+          git push -u -f origin HEAD:static-generated