diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3565e32..0e9143a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,14 +58,10 @@ jobs: run: | git checkout main git reset --hard upstream/main - git push origin main --force || (for i in {1..10}; do - echo "------" && - echo "你需要手动同步上游分支" && - echo "同步方法如下:" && - echo "1. 打开你的仓库首页:https://github.com/${{ github.repository }}" && - echo "2. 点击 Sync fork"&& - echo "3. 点击 Update branch 或 Discard xxx commits"; - done; exit 1) + git add -u + git commit -m "Update from upstream" + git pull --rebase upstream main + git push origin main --force # 从备份目录将.txt文件还原到当前目录,然后删除备份目录 - name: Restore local .txt files and delete backup