From 3e8639ae384ce43f4cae450168e86b0a23bea51c Mon Sep 17 00:00:00 2001
From: Carvin Yu <46855952+Carvin-Yu@users.noreply.github.com>
Date: Sun, 7 Jan 2024 09:33:53 +0800
Subject: [PATCH] Update update-feature-branches.yaml

---
 .github/workflows/update-feature-branches.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-feature-branches.yaml b/.github/workflows/update-feature-branches.yaml
index 6a2e2bb..80273f3 100644
--- a/.github/workflows/update-feature-branches.yaml
+++ b/.github/workflows/update-feature-branches.yaml
@@ -23,8 +23,8 @@ jobs:
           git fetch --unshallow
           for branch in $(git branch -r --list "origin/feature/*"); do
             branch_name=$(echo $branch | sed 's/origin\///')
-            git checkout -B $branch_name $branch
-            git pull
+            git checkout -B $branch_name $branch  || true
+            git pull || true
             if git merge main --no-commit; then
                 git commit -m "Merge main into $branch_name"
                 git push origin $branch_name
@@ -35,4 +35,3 @@ jobs:
             fi
           done
 
-