fix: deploy.sh改用git fetch+reset--hard避免本地修改冲突

README.md

@@ -237,10 +237,10 @@ npx tsx scripts/fix-audio-issues.ts --merge-all --book 5
 
 ```bash
 # 仅后端
-ssh aliyunos4 "cd /data/ai/audio_codebuddy && git pull origin master && cd server && npx prisma generate && rm -rf dist && npm run build && pm2 reload server"
+ssh aliyunos4 "cd /data/ai/audio_codebuddy && git fetch origin master && git reset --hard origin/master && cd server && npx prisma generate && rm -rf dist && npm run build && pm2 reload server"
 ```
 
-流程：`git push → SSH → git pull → npm build → pm2 reload`
+流程：`git push → SSH → git fetch + reset --hard → npm build → pm2 reload`
 
 ### 部署前端
 
@@ -276,7 +276,8 @@ ssh -p 22622 root@8.159.134.106
 
 # 2. 服务器上执行
 cd /data/ai/audio_codebuddy
-git pull origin master
+git fetch origin master
+git reset --hard origin/master
 cd server
 npx prisma generate
 rm -rf dist

server/deploy.sh

@@ -5,7 +5,8 @@ set -e
 cd /data/ai/audio_codebuddy
 
 echo "=== 1. 拉取 ==="
-git pull origin master
+git fetch origin master
+git reset --hard origin/master
 echo "当前: $(git log --oneline -1)"
 
 echo "=== 2. Prisma ==="