Auto merge base into main

2025-04-22 06:47:48 +00:00
parent 88c6675db4 a5fc7b8160
commit fbdcc7f9cf
1 changed files with 8 additions and 0 deletions
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -39,3 +39,11 @@ jobs:
          git checkout tabbar
          git merge base --no-ff -m "Auto merge base into tabbar"
          git push origin tabbar
+
+      - name: Merge base into spa
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout spa
+          git merge base --no-ff -m "Auto merge base into spa"
+          git push origin spa