From 73c6b322d485d49e806a85491c4a2d211378bce9 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Mon, 7 Jun 2021 09:58:58 +0200
Subject: [PATCH] replace merge action

---
 .github/workflows/nightly_merge.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml
index 5d900d377e..9e6a721f99 100644
--- a/.github/workflows/nightly_merge.yml
+++ b/.github/workflows/nightly_merge.yml
@@ -14,10 +14,10 @@ jobs:
     - name: 🚛 Checkout Code
       uses: actions/checkout@v2
 
-    - name: Merge development -> main
-      uses: devmasx/merge-branch@v1.3.1
+    - name: 🔨 Merge main back to develop    
+      uses: everlytic/branch-merge@1.1.0
       with:
-        type: now
-        from_branch: develop
-        target_branch: main
-        github_token: ${{ secrets.ADMIN_TOKEN }}
\ No newline at end of file
+        github_token: ${{ secrets.ADMIN_TOKEN }}
+        source_ref: 'develop'
+        target_branch: 'main'
+        commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'
\ No newline at end of file