From 0892d9c12d56ba12c6b56c94dc0efc121c15b66d Mon Sep 17 00:00:00 2001 From: freearhey Date: Thu, 6 May 2021 19:42:25 +0300 Subject: [PATCH] Update clean.yml --- .github/workflows/clean.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index e9a2e5ce2..96210f463 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -185,8 +185,7 @@ jobs: git diff-index --quiet HEAD || git commit -m "[Bot] Update ${{ matrix.country }}.m3u" - name: Pull Remote run: | - git config pull.ff only - git pull origin bot/patch-1 --allow-unrelated-histories + git pull origin bot/patch-1 --rebase - name: Push Changes uses: ad-m/github-push-action@master with: