Update Merge-Upstream.yml

.github/workflows/Merge-Upstream.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: master
+        ref: main
         fetch-depth: 0
         lfs: true
 
@@ -38,7 +38,7 @@ jobs:
         git config --global --list
 
     - name: Load upstream commits
-      run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit --allow-unrelated-histories
+      run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit
 
     - name: Apply commit changes
       run: |