Skip to content

Commit 1b4c18a

Browse files
author
Omer Bulut
committed
fix: add git pull before push to handle remote conflicts
1 parent a5ddd08 commit 1b4c18a

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ jobs:
138138
git config --local user.name "GitHub Action"
139139
git add Logger.hpp
140140
git commit -m "chore: auto-bump version to $NEW_VERSION [skip ci]"
141+
142+
# Pull latest changes before push to avoid conflicts
143+
git pull origin main --rebase
141144
git push origin main
142145
143146
echo "🚀 Version $NEW_VERSION pushed to main"

0 commit comments

Comments
 (0)