Added rebase flag to Update Theme Timestamps action (#582)

* Update `updated at` field for `39907934-59e9-4e42-89f0-a254d3c5e280 ad97bb70-0066-4e42-9b5f-173a5e42c6fc bc25808c-a012-4c0d-ad9a-aa86be616019 `

* added rebase strategy to `Update Theme Timestamps` action

* added indent for proper json formatting

* added indent for proper formatting to `Rebuild Themes` as well

* Added indent for proper formatting to `Submit Theme`

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
TheRealMG 2024-10-18 05:54:17 -05:00 committed by GitHub
parent c544ca0cef
commit 6c30ab0b6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 7 additions and 47 deletions

View file

@ -55,5 +55,5 @@ jobs:
git add "themes/$theme/theme.json"
done
git commit -m "Update \`updated at\` field for \`$CHANGED_THEMES\`"
git pull origin main --strategy-option=theirs
git pull origin main --rebase --strategy-option=theirs
git push origin main