This commit is contained in:
NianBroken
2024-02-13 13:15:06 +08:00 Unverified
parent 3e6799784b
commit 7ae7aba2ac
+4 -8
View File
@@ -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