From c32225d4e7f3de8c6ff00a60cbff83c312daea6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=B0=8F=E9=B8=BD?=
 <128568434+jixiexiaoge@users.noreply.github.com>
Date: Mon, 2 Dec 2024 10:29:27 +0800
Subject: [PATCH] Update sync-branches.yml

3
---
 .github/workflows/sync-branches.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml
index a170db1..47dcb10 100644
--- a/.github/workflows/sync-branches.yml
+++ b/.github/workflows/sync-branches.yml
@@ -2,7 +2,7 @@ name: Sync Branches
 
 on:
   schedule:
-    # 每天10点UTC（你可以根据需要调整时区）
+    # 每天3点UTC（你可以根据需要调整时区）
     - cron: '0 10 * * *'
 
 jobs:
@@ -30,17 +30,12 @@ jobs:
           git remote add frogai https://github.com/FrogAi/FrogPilot.git
           git fetch frogai
 
-      - name: Merge `mazda-frogpilot-dev` into current branch
+      - name: Create and push mazda-frogpilot-dev branch
         run: |
-          git checkout main  # 你可以修改为目标分支
-          git merge moretore/mazda-frogpilot-dev --no-ff --commit -m "Sync with mazda-frogpilot-dev"
+          git checkout -b mazda-frogpilot-dev moretore/mazda-frogpilot-dev
+          git push origin mazda-frogpilot-dev
 
-      - name: Merge `FrogPilot` into current branch
+      - name: Create and push FrogPilot branch
         run: |
-          git merge frogai/FrogPilot --no-ff --commit -m "Sync with FrogPilot"
-
-      - name: Push changes back to the main repository
-        run: |
-          git push origin main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          git checkout -b FrogPilot frogai/FrogPilot
+          git push origin FrogPilot