From d1e8e8dcb4e20f891038713671caa444f9f150d7 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:04:32 +0800 Subject: [PATCH] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 24e1bde..6a665b8 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -31,12 +31,29 @@ jobs: git remote add frogai https://github.com/FrogAi/FrogPilot.git git fetch frogai + - name: Delete conflicting branch mazda-frogpilot-dev if it exists + run: | + git branch -r | grep "origin/mazda-frogpilot-dev" && git push origin --delete mazda-frogpilot-dev || echo "No conflict with mazda-frogpilot-dev" + - name: Create and push mazda-frogpilot-dev branch run: | git checkout -b mazda-frogpilot-dev moretore/mazda-frogpilot-dev git push origin mazda-frogpilot-dev + - name: Delete conflicting branch FrogPilot if it exists + run: | + git branch -r | grep "origin/FrogPilot" && git push origin --delete FrogPilot || echo "No conflict with FrogPilot" + - name: Create and push FrogPilot branch run: | git checkout -b FrogPilot frogai/FrogPilot git push origin FrogPilot + + - 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 + run: | + git checkout -b FrogPilot-Development frogai/FrogPilot-Development + git push origin FrogPilot-Development