nextcloud / notes

✎ Distraction-free notes and writing
https://apps.nextcloud.com/apps/notes
GNU Affero General Public License v3.0
623 stars 133 forks source link

Manage concurrent edits of notes part 2 #1280

Open tiptoptom opened 7 months ago

tiptoptom commented 7 months ago

Is your feature request related to a problem? Please describe. If a note, for example with a checklist, is changed on two devices at the same time, this always leads to a conflict.

Describe the solution you'd like For my understanding, the merge mechanism #56 would have to look more closely at what has changed when and where in the file in order to be able to merge different changes on different devices in a meaningful way. Perhaps the document can be compared line by line and the latest version of the line is kept. If A has changed something in line 1, it is newer than line 1 of B. If B has changed line 2, it is newer than line 2 of A.

Describe alternatives you've considered I can well imagine that it is difficult to implement such a comparison with Markdown. Perhaps a separate app would have to be created for this (simultaneous and possibly offline editing of a document).