Pull after committing regenerated files

PiperOrigin-RevId: 516537048
2 years ago · 3b2eadf3cd
parent a85eda6647
commit 3b2eadf3cd
1 changed files with 1 additions and 1 deletions
--- 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..."