From 5baa5451eacaf042ed8f7e907587d3af5cce3b80 Mon Sep 17 00:00:00 2001 From: freearhey Date: Thu, 6 May 2021 19:32:15 +0300 Subject: [PATCH] Update clean.yml --- .github/workflows/clean.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 2add197c78..5544d14d3d 100644 --- 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 pull origin bot/patch-1 + git config pull.rebase false + git pull origin bot/patch-1 --allow-unrelated-histories - name: Push Changes uses: ad-m/github-push-action@master with: