From 3b2eadf3cdbe2ae82f8fbbb2c8903d7423a99dce Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Tue, 14 Mar 2023 08:51:09 -0700 Subject: [PATCH] Pull after committing regenerated files PiperOrigin-RevId: 516537048 --- ci/push_auto_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..."