Don't create a conflict when remote note has been deleted and local has been modified

[laurent22]

Operating system

Windows

Joplin version

3.0.0

Desktop version info

No response

Current behaviour

When a remote note is deleted and the local one has been modified, we currently create a copy of the local note to the Conflict folder, and delete the local note. Strictly speaking this is probably the correct approach, however it can cause issues that are hard to resolve when users delete large number of notes on various devices, move them around to other folder, and other large operations.

This can result in many notes ending up in the Conflict folder in a flat hierarchy and then it's difficult to understand what happened and how to resolve the conflict.

Instead when the remote note has been deleted, and the local one has been modified, we should simply ignore the remote deletion. It means the user may end up with a note that they wanted to delete but it's easy to fix by deleting it again, and will cause less troubles than unwanted conflicts.

Expected behaviour

No response

Logs

No response