被水淹没 发表于 2023-8-1 09:55:39

请教一下,为什么本地编辑文件会导致冲突

请教一下,为什么本地编辑文件会导致冲突


例如我打开一个md文件进行编辑,
保存后大概率会出现 .sync-conflict-* 冲突文件

需要在编辑前关闭同步才不会发生这种事
按理说本地编辑,其他同步机子不动的情况下,应该不会出现与别的机子文件冲突的问题?
(关闭冲突保留的话又怕真冲突了没保留文件处理T.T)

data:image/png;base64,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

data:image/png;base64,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

admin 发表于 2023-8-1 15:19:30

如果 2台设备修改完的文件 还没同步到对方, 对方也做了修改没同步回来,就会产生冲突。

被水淹没 发表于 2024-2-1 00:27:20

admin 发表于 2023-8-1 15:19
如果 2台设备修改完的文件 还没同步到对方, 对方也做了修改没同步回来,就会产生冲突。 ...

这里有点问题,我只操作一个设备,然后不知道为什么就会有冲突文件...然后各个设备就都有这个冲突文件了,这个问题让我很困扰。

特别是在有自动保存功能的文本编辑器,会频繁出现这个问题。
页: [1]
查看完整版本: 请教一下,为什么本地编辑文件会导致冲突