I often edit my entries from multiple devices (Windows/Android) throughout the day, and sync them using Google Drive. This works well if I ensure a sync occurs both before and after using each device, but it's easy to miss one of these syncs and end up with a conflict. Currently, it seems that the last device to sync an entry will overwrite the entire entry with its local version, thereby losing anything else that might have been entered. I would love it if instead, the contributions of multiple devices syncing were merged a la Github (or some other versioning software). In case of conflicting changes, a simple inline note with both copies would work. e.g.
I went for lunch with person 1, 2, and 3.
DEVICE A - "I ordered a salad"
DEVICE B - "I ordered a soup"
I did not enjoy the lunch due to....
If merging is not feasible to implement, another workaround would be to save the conflicting entry as a second entry for the day. This could then be manually merged, and at least least nothing would be lost in a conflict.
Thank you!
Diarium version: 2.9.37
Operating system: Windows, Android
