[PR #919] [MERGED] feat: 优化 pull 操作执行逻辑 #810

New issue

Closed

opened 2026-03-02 03:41:50 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 03:41:50 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/codexu/note-gen/pull/919
Author: @codexu
Created: 2/28/2026
Status: ✅ Merged
Merged: 2/28/2026
Merged by: @codexu

Base: dev ← Head: fix/pull-operation-risk

📝 Commits (5)

4dc7012 docs: 添加 pull 操作风险修复设计方案
5ec6b1a feat: 修复 pull 操作的数据安全风险
00fac05 fix: 优化 pull 按钮状态显示顺序
cf81c25 feat: 打开文件时检测到远程更新则弹窗确认
49bd96d fix: 恢复自动拉取逻辑

📊 Changes

3 files changed (+599 additions, -88 deletions)

View changed files

➕ docs/plans/2026-02-28-pull-operation-risk-fix-design.md (+168 -0)
➕ src/app/core/main/editor/markdown/sync/conflict-dialog.tsx (+204 -0)
📝 src/app/core/main/editor/markdown/sync/pull-button.tsx (+227 -88)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/codexu/note-gen/pull/919 **Author:** [@codexu](https://github.com/codexu) **Created:** 2/28/2026 **Status:** ✅ Merged **Merged:** 2/28/2026 **Merged by:** [@codexu](https://github.com/codexu) **Base:** `dev` ← **Head:** `fix/pull-operation-risk` --- ### 📝 Commits (5) - [`4dc7012`](https://github.com/codexu/note-gen/commit/4dc7012dc5e486011c2bca8007d478bd6b25a04d) docs: 添加 pull 操作风险修复设计方案 - [`5ec6b1a`](https://github.com/codexu/note-gen/commit/5ec6b1a08e27cfcc257d8041c8b6a4df96f67098) feat: 修复 pull 操作的数据安全风险 - [`00fac05`](https://github.com/codexu/note-gen/commit/00fac056848bbfad0b4d2fe06c154031f40c25cf) fix: 优化 pull 按钮状态显示顺序 - [`cf81c25`](https://github.com/codexu/note-gen/commit/cf81c253f963a52e5853a04c5fb594b501bbb9d5) feat: 打开文件时检测到远程更新则弹窗确认 - [`49bd96d`](https://github.com/codexu/note-gen/commit/49bd96d9ca6825839fee2b3bdac5a90ca098c63f) fix: 恢复自动拉取逻辑 ### 📊 Changes **3 files changed** (+599 additions, -88 deletions) <details> <summary>View changed files</summary> ➕ `docs/plans/2026-02-28-pull-operation-risk-fix-design.md` (+168 -0) ➕ `src/app/core/main/editor/markdown/sync/conflict-dialog.tsx` (+204 -0) 📝 `src/app/core/main/editor/markdown/sync/pull-button.tsx` (+227 -88) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>