From 641c949d15ba1af7fdea5ac9b410661f910ddbd0 Mon Sep 17 00:00:00 2001
From: ClayMoreBoy <6189207+ClayMoreBoy@users.noreply.github.com>
Date: Fri, 12 Jan 2024 20:52:27 +0800
Subject: [PATCH] Update Merge-Upstream.yml

---
 .github/workflows/Merge-Upstream.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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