diff --git a/.github/workflows/Merge-Upstream.yml b/.github/workflows/Merge-Upstream.yml index 9cc1935..220a294 100644 --- a/.github/workflows/Merge-Upstream.yml +++ b/.github/workflows/Merge-Upstream.yml @@ -26,7 +26,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - ref: main + ref: master fetch-depth: 0 lfs: true @@ -36,6 +36,7 @@ jobs: git config --global user.name "github-actions[bot]" git config --global pull.rebase false git config --global --list + rm -rf .git/ - name: Load upstream commits run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit