Add server-update.sh for force sync when CRLF causes git pull conflicts.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-12 14:55:31 +08:00
parent aea39a00ae
commit 1d00c36cd3
3 changed files with 21 additions and 3 deletions
@@ -48,12 +48,16 @@
 > pm2 restart trading_studio
 > ```

-> **git pull 报本地修改冲突？** 执行：
+> **git pull 报本地修改冲突？** 多半是 Windows CRLF 换行符幽灵改动（内容其实没变）。执行：
 > ```bash
-> git stash push -m "backup" -- config.py llm_service.py
-> git pull
+> bash server-update.sh
+> ```
+> 或手动：
+> ```bash
+> git fetch origin && git reset --hard origin/main
 > pm2 restart trading_studio
 > ```
+> 切勿 `git stash pop`，Ollama 地址请写在 `.env` 里。

 ### 0.2 首次一键部署