action: update sync

2024-11-15 19:22:53 +08:00 · 2023-10-23 07:30:54 +08:00 · 2023-10-23 07:30:54 +08:00 · f6f8f27668
commit f6f8f27668
parent dff54464c6
1 changed files with 2 additions and 1 deletions
--- a/.github/workflows/android-branch-auto-sync.yml
+++ b/.github/workflows/android-branch-auto-sync.yml
@ -34,7 +34,8 @@ jobs:
        run: |
          git fetch origin
          git checkout origin/Alpha -b android-real
-          git rebase origin/android-open
+          git merge --squash origin/android-open
+          git commit -m "Android: patch"
      
      - name: Check for conflicts
        run: |