diff --git a/ci/push_auto_update.sh b/ci/push_auto_update.sh index 641525c707..80fa7673ea 100755 --- a/ci/push_auto_update.sh +++ b/ci/push_auto_update.sh @@ -39,7 +39,7 @@ else commit_message="Auto-generate files" fi -git pull --rebase git add -A git diff --staged --quiet || git commit -am "$commit_message" +git pull --rebase git push || echo "Conflicting commit hit, retrying in next job..."