fix: safe merge

bobgobills · Dec 11, 2023 · 559ceed · 559ceed
1 parent 5162bb7
commit 559ceed
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -23,7 +23,11 @@ jobs:
       - name: Build
         run: yarn build
       - name: Check for safe merge
-        run: git merge origin/main --no-ff --no-commit
+        run: |
+          git config --global user.name 'bobgobills'
+          git config --global user.email 'bobgobills@users.noreply.github.com'
+          git merge origin/main --no-ff --no-commit
+          git merge --abort
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}