Skip to content

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

Closed
@88250

Description

@88250
Member

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

改进为生成冲突副本,这样可以让用户更方便地处理冲突数据:直接在笔记本中就能看到或者用搜索找到冲突文档,然后编辑合并或者删除。

Activity

self-assigned this
on Aug 20, 2022
HowcanoeWang

HowcanoeWang commented on Aug 20, 2022

@HowcanoeWang

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

88250

88250 commented on Aug 20, 2022

@88250
MemberAuthor

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

added this to the 2.1.8 milestone on Aug 21, 2022
added a commit that references this issue on Aug 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

Relationships

None yet

    Development

    No branches or pull requests

      Participants

      @88250@HowcanoeWang

      Issue actions

        云端同步发生冲突时生成副本 · Issue #5687 · siyuan-note/siyuan