From 74dd1cb62df6d780a91cdc9a64a4052fbe2a6cfa 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:07:35 +0800
Subject: [PATCH] Update sync-branches.yml

---
 .github/workflows/sync-branches.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml
index 6a665b8..a4140b8 100644
--- a/.github/workflows/sync-branches.yml
+++ b/.github/workflows/sync-branches.yml
@@ -47,6 +47,7 @@ jobs:
       - name: Create and push FrogPilot branch
         run: |
           git checkout -b FrogPilot frogai/FrogPilot
+          git pull --rebase origin FrogPilot || echo "No changes to pull"
           git push origin FrogPilot
 
       - name: Delete conflicting branch FrogPilot-Development if it exists
@@ -56,4 +57,5 @@ jobs:
       - name: Create and push FrogPilot-Development branch
         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