Update update-feature-branches.yaml

Carvin-Yu · Jan 7, 2024 · 3e8639a · 3e8639a
1 parent ed77318
commit 3e8639a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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
 
-