diff --git a/.github/workflows/release_parallel.yml b/.github/workflows/release_parallel.yml index 2b877390cb..e82f98281e 100644 --- a/.github/workflows/release_parallel.yml +++ b/.github/workflows/release_parallel.yml @@ -182,9 +182,11 @@ jobs: # List and merge update branches for branch in $(git branch -r | grep "origin/update-${{ needs.prepare-release.outputs.release-version }}-" | sed 's/origin\///'); do echo "Merging branch: $branch" + git fetch origin $branch:$branch git merge --no-ff "$branch" -m "Merge $branch" || { echo "Failed to merge $branch" - exit 1 + git merge --abort + continue } done