diff --git a/README.md b/README.md index 2821889..528beff 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,7 @@ v3.0 三大子系统协调运作: ```bash git clone https://gitee.com/thzxx/metona-ollama.git cd metona-ollama -git checkout refactor/modular-architecture +git checkout metona-ollama-desktop-v3.1.0 # 安装依赖(国内使用 npmmirror 加速) npm config set registry https://registry.npmmirror.com diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1a848f2..10b6f30 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,15 +2,9 @@ ## 分支结构 -项目有两条产品线,共 22 个分支: - -**Web 版主线**(`master`): -- `v1.1.0` → `v2.0.0` → `v2.1.0` → `v2.2.0` → `v3.0.0` → `v3.0.1` → `v3.0.2` → `v3.1.0` → `v3.1.1` → `v3.2.0` → `v4.0.0` → `v4.0.1` → `v4.0.2`(合并到 master) -- `refactor/modular-architecture`:重构分支,v4.0.3 合并到 master - -**桌面版分支**(从 master v4.0.3 分出): -- `metona-ollama-desktop-v1` → `metona-ollama-desktop-v1.1` → `metona-ollama-desktop-v2` → `metona-ollama-desktop-v3` -- `refactor/modular-architecture`:桌面版重构分支(当前) +**桌面版主线**(`master`): +- `metona-ollama-desktop-v1` → `metona-ollama-desktop-v1.1` → `metona-ollama-desktop-v2` → `metona-ollama-desktop-v3` → `metona-ollama-desktop-v3.1.0`(当前) +- `refactor/modular-architecture`:v3.1.0 重构分支,已合并到 master ---