git config pull.rebase true before pull

GTNewHorizons · Mar 4, 2024 · 6259c18 · 6259c18
1 parent 2302d00
commit 6259c18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/workflows/publish-nightly-lang-pack.yml b/.github/workflows/publish-nightly-lang-pack.yml
@@ -72,6 +72,7 @@ jobs:
           cd ..
       - name: Push commits and tag
         run: |
+          git config pull.rebase true
           git pull
           git push -d origin ${{ inputs.target_lang }}-latest || :
           gh release delete ${{ inputs.target_lang }}-latest || :

diff --git a/.github/workflows/save-nightly-modpack-history.yml b/.github/workflows/save-nightly-modpack-history.yml
@@ -52,5 +52,6 @@ jobs:
           TARGET_LANG: "en_US"
       - name: Push commit
         run: |
+          git config pull.rebase true
           git pull
           git push origin master