From fb291ea765d00a73399b123fde450788dabc8d06 Mon Sep 17 00:00:00 2001
From: NianBroken <suinian666@gmail.com>
Date: Mon, 11 Mar 2024 12:55:41 +0800
Subject: [PATCH] add

---
 .github/workflows/main.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b9d7570..ee3b0aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -73,13 +73,19 @@ jobs:
 
       - name: Backup files
         run: |
-          rm -rf Backup
           mkdir -p Backup
           rsync -av --include="*/" --include="*.txt" --include="*.yml" --exclude="*" ./ Backup/
 
+      - name: Force push changes from upstream to current main branch
+        run: |
+          # 将上游main分支的更改强制推送到当前main分支
+          git checkout main
+          git reset --hard upstream/main
+
       - name: Restore files
         run: |
           rsync -av --exclude="*/" --include="*/" --include="*.txt" --include="*.yml" --exclude="*" Backup/ ./
+          rm -rf backup
 
       - name: Force push changes to main branch
         run: |