Resolve merge conflicts in workflow files, keeping origin/main versions

- deploy-to-server.yml: Keep secret validation step and ssh-keyscan fallback
- update-readme-bulletin.yml: Keep git push retry mechanism (3 attempts)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.github/workflows/deploy-to-server.yml

@@ -86,8 +86,6 @@ jobs:
     needs: validate
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-=======
       - name: 🔐 检查必需 Secrets
         run: |
           MISSING=""
@@ -120,7 +118,6 @@ jobs:
           fi
           echo "✅ 所有必需 Secrets 已配置"
 
->>>>>>> origin/main
       - name: 📥 检出代码
         uses: actions/checkout@v4
 
@@ -136,13 +133,9 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
-<<<<<<< HEAD
-          ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
-=======
           ssh-keyscan -H "${{ secrets.DEPLOY_HOST }}" >> ~/.ssh/known_hosts 2>/dev/null || {
             echo "⚠️ ssh-keyscan 失败，尝试使用 StrictHostKeyChecking=no 作为后备"
           }
->>>>>>> origin/main
 
       - name: 📦 确保远程服务器 rsync 已安装
         run: |

.github/workflows/update-readme-bulletin.yml

@@ -82,10 +82,6 @@ jobs:
             echo "📢 公告区无变化，跳过提交"
           else
             git commit -m "📢 自动更新系统公告区 [skip ci]"
-<<<<<<< HEAD
-            git push
-            echo "✅ 公告区已更新并推送"
-=======
             # 带重试的推送（避免并发推送导致 rejected）
             for i in 1 2 3; do
               if git push; then
@@ -99,5 +95,4 @@ jobs:
                 exit 1
               fi
             done
->>>>>>> origin/main
           fi