diff --git a/ci/push_auto_update.sh b/ci/push_auto_update.sh index 80fa7673eabad..3ee0ec031f50d 100755 --- a/ci/push_auto_update.sh +++ b/ci/push_auto_update.sh @@ -42,4 +42,4 @@ fi 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..." +git push --force-with-lease || echo "Conflicting commit hit, retrying in next job..."