From 385ae4ab7027f1e149a7d7abda35d4673911aeeb Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 19 Aug 2021 21:18:15 -0400
Subject: [PATCH] Update autoMerge.yml

---
 .github/workflows/autoMerge.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml
index f0814d81..cf266188 100644
--- a/.github/workflows/autoMerge.yml
+++ b/.github/workflows/autoMerge.yml
@@ -1,23 +1,30 @@
-name: Auto Merge Pull Request
+name: Auto Merge PR
 
 # Controls when the workflow will run
 on:
+  # Triggers the workflow on push or pull request events but only for the development branch
   pull_request_review: # try to merge after review
     types:
       - submitted
       - edited
       - dismissed
 
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
+  # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    - name: Auto-Merge Pull Request
-      # You may pin to the exact commit or the version.
-      # uses: reitermarkus/automerge@72bc1353d0a084c84034be23424b124d900d1658
-      uses: reitermarkus/automerge@72bc1353d0a084c84034be23424b124d900d1658
-      with:
-        token: ${{ secrets.PUSH_TOKEN }}
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Merge Pal
+        # You may pin to the exact commit or the version.
+        # uses: maxkomarychev/merge-pal-action@7a3bca37e260865d9e9a259212c1d13ef4da7f41
+        uses: maxkomarychev/merge-pal-action@v0.5.1
+        with:
+          # Token to perform api calls
+          token: ${{ secrets.PUSH_TOKEN }}