CI: auto-merge: rebase again before push

google · Jun 5, 2024 · 9b858b2 · 9b858b2
1 parent d02b90f
commit 9b858b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -88,7 +88,7 @@ jobs:
 
       - name: push to release branch
         if: success()
-        run: git push origin
+        run: git fetch && git rebase && git push origin
 
       - name: Upload test results
         if: always()