Sync has issues with multiple devices, especially when changes are made offline

Bug reports
,
3

The issue may happen when there are multiple independent changes to a note.
For example we begin with Note A that is synchronized in both device 1 and device 2.
If device 1 and device 2 both independently make changes to note A, without having the possibility to synchronize in between, then the automatic merge algorithm can produce undesirable outputs.
However, there is no way really to fix this, because when there are multiple conflicting changes, only YOU (the user) know what’s right. No algorithm can merge them correctly.

There are currently two way to go about this:

  1. You either let the automatic merge algorithm attempt. If it fails, you can manually look in the previous versions of Note A which are in the sync version history and file recovery version history.
  2. Disable the automatic merging in case of conflict (We have recently introduce this). In this case, every time there is one of these “merge conflict with independent edits” an additional Note A-conflict will be generated and you have to manually review it Note A and Note A-conflict for changes.

I am asking anyone who is experiencing the issue in this thread to switch to the new “create conflict file” option and let me know what happens.

If after enabling the new “create conflict file” option, you experience conflict files being created even when NO editing has been done on multiple devices, please go here and provide the requested info.