search

vrtmrz / obsidian-livesync

MIT License
5.13k stars 167 forks source link

how to resolve all conflicts one time? #498

Closed whitewatercn closed 1 month ago

whitewatercn commented 2 months ago

Abstract

There are many conflicts in the logs, and resolving them one by one can be tedious, how can i deal with them one time , just overwrite with a new edition?

image
vrtmrz commented 1 month ago

Thank you for asking me! This might be fixed by enabling Always overwrite with a new file and restarting Obsidian, and if not enough, performing Fetch the remote database again.

Or if you have any correct device, rebuilding the databases from the device is more recommended. Then, the rebuilt database will be transferred to the other devices.

Please keep in mind that conflicts are also kept in the remote database. Therefore, without resolving the conflicts, only fetching will not resolve the situation.

I hope that this will help you!

whitewatercn commented 1 month ago

Thank you for asking me! This might be fixed by enabling Always overwrite with a new file and restarting Obsidian, and if not enough, performing Fetch the remote database again.

Or if you have any correct device, rebuilding the databases from the device is more recommended. Then, the rebuilt database will be transferred to the other devices.

Please keep in mind that conflicts are also kept in the remote database. Therefore, without resolving the conflicts, only fetching will not resolve the situation.

I hope that this will help you!

thanks for your reply, i will have a try to rebuild my remote database and test to sync again