From 11226eb3cfa945b72d3aee7b44eba17867ea2543 Mon Sep 17 00:00:00 2001
From: hlafaille <hlafaille@proton.me>
Date: Thu, 2 Jan 2025 12:54:46 -0500
Subject: [PATCH] BIL-6: sync develop and main

---
 .github/workflows/sync-develop.yml | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/sync-develop.yml

diff --git a/.github/workflows/sync-develop.yml b/.github/workflows/sync-develop.yml
new file mode 100644
index 00000000..ef0da884
--- /dev/null
+++ b/.github/workflows/sync-develop.yml
@@ -0,0 +1,31 @@
+name: Sync Develop with Main
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  merge-to-develop:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Fetch all branches
+        run: git fetch --all
+
+      - name: Check out develop branch
+        run: git checkout develop
+
+      - name: Merge main into develop
+        run: git merge origin/main --no-edit
+
+      - name: Push changes to develop
+        run: git push origin develop