From 0d6f219306895f54a58af334168d9749b8465179 Mon Sep 17 00:00:00 2001
From: Isaac Milarsky <krabs@tilde.team>
Date: Thu, 22 Feb 2024 10:32:03 -0600
Subject: [PATCH] add auto merge github workflow to repo scaffolder

Signed-off-by: Isaac Milarsky <krabs@tilde.team>
---
 .github/workflows/autoMergeMainIntoDev.yml | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/autoMergeMainIntoDev.yml

diff --git a/.github/workflows/autoMergeMainIntoDev.yml b/.github/workflows/autoMergeMainIntoDev.yml
new file mode 100644
index 0000000..d3e0e6f
--- /dev/null
+++ b/.github/workflows/autoMergeMainIntoDev.yml
@@ -0,0 +1,27 @@
+name: Merge main into dev
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update-dev:
+    permissions: write-all
+    name: update-dev
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - run: |
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@users.noreply.github.com'
+          git checkout dev
+          git merge main
+          echo "Done with merge"
+      - name: Push to dev
+        uses: CasperWA/push-protected@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: dev
\ No newline at end of file