Skip to content

Commit

Permalink
fetch the branch
Browse files Browse the repository at this point in the history
  • Loading branch information
bdemann committed Oct 15, 2024
1 parent c539b67 commit 14fcc97
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/release_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 14fcc97

Please sign in to comment.