Conflict management hits back again

[gerroon]

Hi

It seems like there is some kind of new type of conflict management, which is how it was some months ago. it is really counter productive because I keep pressing "use ours" on all my devices and it does not go away. It keeps asking me. It would be real real really nice if it just uses whatever is the latest. Can you please provide a setting for forcing the newest at all times for those of us who just want the latest synced to the server and not dealing with conflicts? it is very hard to manage this type of stuff I am literally clicking on random things without a clear goal since I have no idea what changed where, if I can track of what chjanged where then in theory I would not as a user need to use an extension for this anyway.

Thanks for improving the plugin, I just feel like some of these new features are becoming a burden on the user.

[stychos]

It ate most of my data telling me "chunks are not valid". Stupid me to move everything to Obsidian and for not preparing backups.

[vrtmrz]

Sorry for being late! This dialogue does not mean something has got conflicted.

This dialogue is displayed if different values are set for items that should have the same value on several devices. Therefore, we should decide which configuration to use. Selecting Use ours will erase all other stored configurations on the server, and store the configuration of the device as the one and only correct one. Therefore, if we try to select 'Use ours' on all devices, it will eventually appear again on the subsequent device.

If you have decided to Use ours on the device, please select Remote 1 on the other devices! (I think that the biggest mistake is I have missed writing this procedure in the dialogue...).

If you do not want this feature completely, we can disable this feature by the Do not check configuration mismatch before replication. toggle in the Hatch pane. (And, this could be the second mistake).

Would you mind if I ask you to check whether the dialogue no longer appears by selecting Use ours for the specific device, and Remote 1 for other devices, please?

Thanks for improving the plugin, I just feel like some of these new features are becoming a burden on the user.

Indeed, it is all my regret to let you all spend so much time and worries. I am so grateful and so honoured for all of your positive feedback; for example, giving this repo a star. I am sometimes very surprised to see that. However, this should be equal to our responsibility. Possibly it means that we have reached a point where we have to make progress without a lack of peace and harmony.

Therefore, I am going to release all the new features in a disabled state, basically, from the next release. I know that some people want beta releases, but let me confess that I am not really good with the concept of beta versions. (I am very poor at focusing on more than two things, so probably only the beta version will be released, you know... It is the same as why this repo does not have any feature branch). Only when a major version is raised will the default values change. However, I think it will remain very inconvenient as it is, so I will display a recommended message for each release!

@stychos So apologies! There could be other causes, but as you say, the situation has become impossible to determine. Possibly Vault history (in the command palette) or Verify and repair all files (in the Hatch pane) will help us. Both features can check the file is matched between the vault and the local database.

[gerroon]

Hi

Thanks for explaining. in my case "use ours" show up here and there when I press sync manually, and it does not sync if I do not "use ours", that is an issue both on my iphone and my windows, since that feature I have pressed use ours hundreds of times, or else nothing is synced. It became very tedious.

This message always shows up on both devices.

I will try the option you recommended

[stychos]

@stychos So apologies! There could be other causes, but as you say, the situation has become impossible to determine. Possibly Vault history (in the command palette) or Verify and repair all files (in the Hatch pane) will help us. Both features can check the file is matched between the vault and the local database.

Wow, never apology for things like that. It's an opens-source and that is definitely my own fault for not doing proper backups, thanks a lot for your work and efforts!

Looks like in the Vault history I can recover at least notes headers. Better than nothing :) I will also try to look into the CouchDB later.

[gerroon]

Enabling "Do not check configuration mismatch before replication" seems to bring the old behavior back, I will keep testing it. Thanks.

[vrtmrz]

At v0.23.17, I have refined this feature almost totally. I think we can resolve the conflict more clearly. The documentation is on the FAQ.

I hope it has got easier to understand and use.