Merging notes.sqlite in case of a sync conflict

[pbek]

It would be great if the data of notes.sqlite could be merged in case of a sync conflict (if it was changed on two computers).

A complete merge would be very difficult. Maybe starting on more easy parts first.

• [x] Checking if conflicted database file differs at all
• [x] Delete conflicted copies of the note folder database notes.sqlite immediately if tags and tag assignments are not different to the ones from the current notes.sqlite
• [x] Handling different database versions? (not needed, will be ignored)
• [x] Merging trash table? (not needed, will be ignored)
• [ ] Merging tags and tag assignments

[pbek]

@dsamersoff, one for you

20.2.4

• conflicted copies of the note folder database notes.sqlite are now immediately deleted if they are not different to the current notes.sqlite

[pbek]

@dsamersoff, another one for you

20.2.8

• conflicted copies of the note folder database notes.sqlite are now immediately deleted if tags and tag assignments are not different to the ones from the current notes.sqlite
  • all other table differences can be safely ignored

[pbek]

There now is a new release, could you please test it and report if it works for you?

[dsamersoff]

I'll try to test it this week.