matrix-notepad icon indicating copy to clipboard operation
matrix-notepad copied to clipboard

Conflict resolution

Open KB1RD opened this issue 6 years ago • 2 comments

Let's say both Alice and Bob both insert a character at the same position at the same time. These new characters will both have the same ID and the same vector clock. That means whichever arrives first is visible. These conflicts should be at least shown somewhere and preferably should allow the user to resolve them.

KB1RD avatar Oct 25 '19 19:10 KB1RD

I am actively working on this now as the only change for the next release, which I am targeting sometime after the new year. Yeah that's a lot of time, but it will require the creation of completely new concepts and the implementation of those on top of an already complicated algorithm. Incidentally, this will create a new event schema and will break old rooms. On a related note, I should start including state resolution algorithm versions in the room creation event...

KB1RD avatar Dec 08 '19 02:12 KB1RD

So if multiple users insert text at the same position, both users' data will be displayed side by side, however, there will be no indication that it is conflicting. The anchors in logootish-js are designed to fix this, but are not yet implemented.

KB1RD avatar Jul 01 '20 11:07 KB1RD