Skip to content

Commit ac774ef

Browse files
committed
Fix release workflow git push conflicts
- Add git pull --rebase before pushing to main - Prevents non-fast-forward errors when main branch has moved ahead - Ensures release workflow can complete successfully
1 parent a387d45 commit ac774ef

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ jobs:
106106
107107
- name: Push changes and tags
108108
run: |
109+
# Pull latest changes to avoid conflicts
110+
git pull --rebase origin main
109111
git push origin main
110112
git push origin "v$NEW_VERSION"
111113

0 commit comments

Comments
 (0)