Update auto-update.yml

4 years ago · 0c62d8348a
parent ce18f5e6e9
commit 0c62d8348a
1 changed files with 2 additions and 2 deletions
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@ -47,9 +47,9 @@ jobs:
        with:
          ref: bot/auto-update
      - name: Fetch Origin
-        run: git fetch origin --allow-unrelated-histories
+        run: git fetch origin
      - name: Update from master
-        run: git merge origin/master
+        run: git merge --allow-unrelated-histories origin/master
      - name: Generate Token
        uses: tibdex/github-app-token@v1
        id: generate-token