Giter Site home page Giter Site logo

Comments (2)

Kenshin avatar Kenshin commented on June 26, 2024

emmm 这个冲突是因为:(举个例子)

6月3日 11:25 你在 Win10 上面使用了简悦并同时开着坚果云,这时坚果云 Web 端的时间也是 6月3日 11:25
6月3日 12:25 在 Win11 上面,没有开坚果云,但同时使用了简悦,所以你本地的 simpread_config.json6月3日 12:25,而后你在 Win11 上面开启了坚果云;坚果云判断这两个文件出现了分歧(时间不一样,文件内容不一样)

解决方案

其实并没有完美的解决方案 😂

简单的取舍在于:看哪个冲突没有新的稍后读,就舍弃哪个。

如果 Win11 与 Win10 都分别有新的稍后读,你可以将这两个文件发送到 help#####simpread.pro 邮箱里面(注意 #@)并注明这个 Issues ID:6529

然后在这里告诉我,我来手动帮你合并。

简悦的数据基于文本结构,所以很容易做合并,只是需要些动手能力而已。

from simpread.

Kenshin avatar Kenshin commented on June 26, 2024

避免这种问题的解决方案

确保在使用简悦前,务必要运行:坚果云和同步助手,即可。

如果感兴趣的话,可以看下 https://www.yuque.com/kenshin/simpread/dgmm5q 里面有关于多设备同步的「原理」,几分钟就能看明白。

from simpread.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.