Update clean.yml

4 years ago · 5baa5451ea
parent b37694236d
commit 5baa5451ea
1 changed files with 2 additions and 2 deletions
--- a/.github/workflows/clean.yml
+++ b/.github/workflows/clean.yml
@ -187,8 +187,8 @@ jobs:
          git diff-index --quiet HEAD || git commit -m "[Bot] Update ${{ matrix.country }}.m3u"
      - name: Pull Remote
        run: |
-          git config pull.ff only
+          git config pull.rebase false
-          git pull origin bot/patch-1
+          git pull origin bot/patch-1 --allow-unrelated-histories
      - name: Push Changes
        uses: ad-m/github-push-action@master
        with: