ifix: fix release to main sync by using --no-edit instead of --ff-only

Author: kubrickcode

.github/workflows/release.yml

@@ -60,10 +60,13 @@ jobs:
           HUSKY: 0
 
       - name: Sync release to main
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin release
           git fetch origin main
           git checkout main
-          git merge origin/release --ff-only
-          git push https://x-access-token:${{ secrets.PAT_TOKEN }}@github.com/${{ github.repository }}.git main
+          git merge origin/release --no-edit
+          git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git main