From 5fec55644fd35066ffc6ef88cd31167b87e8d555 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: Sat, 7 Dec 2024 16:13:34 +0800
Subject: [PATCH] Update sync-branches.yml

---
 .github/workflows/sync-branches.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml
index a4140b8..0bec11c 100644
--- a/.github/workflows/sync-branches.yml
+++ b/.github/workflows/sync-branches.yml
@@ -44,18 +44,20 @@ jobs:
         run: |
           git branch -r | grep "origin/FrogPilot" && git push origin --delete FrogPilot || echo "No conflict with FrogPilot"
 
-      - name: Create and push FrogPilot branch
+      - name: Force fetch and reset FrogPilot branch from remote
         run: |
-          git checkout -b FrogPilot frogai/FrogPilot
-          git pull --rebase origin FrogPilot || echo "No changes to pull"
-          git push origin FrogPilot
+          git fetch --all
+          git checkout --orphan FrogPilot
+          git reset --hard frogai/FrogPilot
+          git push origin FrogPilot --force
 
       - name: Delete conflicting branch FrogPilot-Development if it exists
         run: |
           git branch -r | grep "origin/FrogPilot-Development" && git push origin --delete FrogPilot-Development || echo "No conflict with FrogPilot-Development"
 
-      - name: Create and push FrogPilot-Development branch
+      - name: Force fetch and reset FrogPilot-Development branch from remote
         run: |
-          git checkout -b FrogPilot-Development frogai/FrogPilot-Development
-          git pull --rebase origin FrogPilot-Development || echo "No changes to pull"
-          git push origin FrogPilot-Development
+          git fetch --all
+          git checkout --orphan FrogPilot-Development
+          git reset --hard frogai/FrogPilot-Development
+          git push origin FrogPilot-Development --force