diff --git a/.github/workflows/manual_api_cache_update.yml b/.github/workflows/manual_api_cache_update.yml index 3b2055d..2b5bc61 100644 --- a/.github/workflows/manual_api_cache_update.yml +++ b/.github/workflows/manual_api_cache_update.yml @@ -34,7 +34,12 @@ jobs: python scripts/update_cache_api.py - name: Commit Changes run: | - git checkout -b api-bot/update-cache + git fetch origin main + git checkout -b api-bot/update-cache + git stash push -m "Pre-rebase stash" + git rebase origin/main + git push + git stash pop git config user.name "Blender Launcher[bot]" git config user.email "Blender-Launcher[bot]@users.noreply.github.com" git add .