Strange Conflict Files - Githubissues

vrtmrz / obsidian-livesync

MIT License

4.7k stars 151 forks source link

Strange Conflict Files #279

Open Creling opened 1 year ago

Creling commented 1 year ago

Hi,

There are some strange conflict files in my vault as the following snapshot shows:

The Code01 in the file path is the name of another device. It seems that the configuration of Code01 is synced to this device.

My problem is:

Why do the conflicts appear here but not in the customized sync tab?
How can I resolve these conflicts once and for all? I manually resolve them several times but they re-appear soon.

vrtmrz commented 1 year ago

Thank you for asking me! As you mentioned, the first piece of path (Code01) is the device name. This is the reason of device name is required to be unique among the devices. Usually, these files would not be conflicted (The device should only update its information on the device). Therefore, the UI does not show the conflicts. However, possibly the feature to handle issues about this might be useful. It will be improved. (It would be automatically resolved by a newer version).

vrtmrz commented 1 year ago

Since v0.19.20, Self-hosted LiveSync will resolve the conflicts of customized sync files automatically by their modified date. Could you please check the behaviour, please?

Creling commented 1 year ago

Since v0.19.20, Self-hosted LiveSync will resolve the conflicts of customized sync files automatically by their modified date. Could you please check the behaviour, please?

Yes, it works like a charm now. As you see, the conflict files are automatically resolved.