search

vrtmrz / obsidian-livesync

MIT License
5.02k stars 164 forks source link

Miss-leading conflict message on some setting combination. #465

Open future0906 opened 4 months ago

future0906 commented 4 months ago

I got a notice from livesync plugins said that I was conflicted with some file, notice looks like this:

[object Object] is conflicted, merging process has been postponed.

But I run resolve all conflicts command found not conflicted file. It's a little bit strange, so I digg deeper that found, it's a false conflict notice.

When I enable "Sync on File open", every time I open a new file, plugin will schedule a conflict check: queueConflictCheck.If I open another file when last sync and conflict check isn't finished and checkConflictOnlyOnOpen is checked, it will fire a notice, sinice active file isn't prev file.

I think that will be more accurate notice when actual conflict is happend.

Also for how want to avoid this notice, just uncheck checkConflictOnlyOnOpen option.

vrtmrz commented 3 months ago

Sorry for being late! And thank you for opening the issue!

[object Object] is conflicted, merging process has been postponed.

This is quite a fatal mistake for the logging. This makes addressing the issue harder. I will address it.

And I also believe that these conflict-handling-determination toggles are being handled in a subtle way, losing and gaining their meaning again. I will try to think about this area a little more so that it can be handled in a more unified way.

future0906 commented 3 months ago

Thanks for your reply. I think that's not really a issue actually.I opened this issuse as notice to someone that occur same message. Appreciate for your work on this plugin :).