update pre-push hook

Author: dynamic-stall

.github/workflows/sync-branches.yml

@@ -6,37 +6,18 @@ on:
       - main
 
 jobs:
-  merge-branches:
+  sync-branches:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Check Main Branch Status
-        run: |
-          local_ref=$(git rev-parse main)
-          remote_ref=$(git rev-parse origin/main)
-          if [ "$local_ref" != "$remote_ref" ]; then
-            echo "HEAD is behind origin/main. Merging..."
-            git fetch origin/main
-            git merge origin/main -m "Actions workflow: auto-merge origin/main -> main"
-          fi
-
-      - name: Handle Merge Conflicts
-        run: |
-          if [ -n "$(git status --short | grep 'U')" ]; then
-            echo "Merge conflicts found. Waiting for resolution..."
-            while [ -n "$(git status --short | grep 'U')" ]; do
-              sleep 5
-            done
-          fi
+        uses: actions/checkout@v4
 
       - name: Merge Main into Dev
         run: |
           git switch dev
-          git merge origin/main -m "Actions workflow: auto-merge main -> dev"
-
-      - name: Merge Main into Test
+          git merge main
+          
+      - name: Merge main into test
         run: |
           git switch test
-          git merge origin/main -m "Actions workflow: auto-merge main -> test"
+          git merge main