Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

云端同步发生冲突时生成副本 #5687

Closed
88250 opened this issue Aug 20, 2022 · 2 comments
Closed

云端同步发生冲突时生成副本 #5687

88250 opened this issue Aug 20, 2022 · 2 comments
Assignees
@88250
Labels
Enhancement
Milestone
2.1.8

Comments

@88250
Copy link
Member

88250 commented Aug 20, 2022 •
edited

云端同步发生冲突时单向的覆盖会让用户困惑（无论是云端覆盖本地还是本地覆盖云端），即使是让用户选择也不太稳，因为用户可能会选错。

改进为生成冲突副本，这样可以让用户更方便地处理冲突数据：直接在笔记本中就能看到或者用搜索找到冲突文档，然后编辑合并或者删除。
@88250 88250 self-assigned this Aug 20, 2022
@HowcanoeWang
Copy link

HowcanoeWang commented Aug 20, 2022 •
edited

建议参考Github的版本对比，提供一个冲突差异显示的界面，不然长文档找起来差异很难受

@88250
Copy link
Member Author

88250 commented Aug 20, 2022

@HowcanoeWang 目前编辑器没有可视化 diff 的方案哦。

@88250 88250 added this to the 2.1.8 milestone Aug 21, 2022
88250 added a commit that referenced this issue Aug 21, 2022
@88250
🎨 云端同步发生冲突时生成副本 #5687
581c1b4
88250 added a commit that referenced this issue Aug 21, 2022
@88250
🎨 云端同步发生冲突时生成副本 #5687
6fa5f21
@88250 88250 mentioned this issue Aug 21, 2022
Closed
1 task
88250 added a commit that referenced this issue Aug 21, 2022
@88250
🎨 云端同步发生冲突时生成副本 #5687
b846e3d
@88250 88250 closed this as completed Aug 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@88250 88250

Labels
Enhancement
Projects
None yet
Milestone
2.1.8
Development

No branches or pull requests
2 participants
@88250 @HowcanoeWang