chore: merge instead of rebase

Author: buehler

.github/workflows/merge-release.yml

@@ -11,11 +11,12 @@ jobs:
         run: |
           git config user.name "GitHub Actions Bot"
           git config user.email "<>"
+          git config pull.ff only
       - name: Push master to release branch
         run: |
           git checkout master
           git pull
           git checkout release
           git pull
-          git rebase master
+          git merge --ff-only master
           git push