From f6f8f27668763581e12b916b976aee8335781f44 Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Mon, 23 Oct 2023 07:30:54 +0800 Subject: [PATCH] action: update sync --- .github/workflows/android-branch-auto-sync.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-branch-auto-sync.yml b/.github/workflows/android-branch-auto-sync.yml index f1a5b2d8..5dbbd5be 100644 --- 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: |