-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conflict resolution is not working in multi-user notebooks #5921
Comments
409 Conflicts still appear when testing multi-user notebooks. @jvigliotta and myself tested this during testathon 10/17/2022. |
Testing NotesTest on 2.1.4.ERT and 2.1.5 |
Testathon 12/29/22: Verified on 2.1.5 and 2.1.4-ERT. One thing I did notice is that the timestamp on the entry is the time the entry was initiated, but not when it was persisted. This can lead to some confusion, but sorting does put the entries in the correct order in terms of when they were persisted. |
Good point. There have been arguments both ways on this one. We will respond to real-world feedback and adjust accordingly. |
Summary
When two users make conflicting changes to a notebook the notebook plugin will detect the conflict and attempt to merge the changes from the two users.
Expected vs Current Behavior
Adding two different entries at the same time should result in both entries appearing in the notebook with no errors shown to the user.
Steps to Reproduce
Observe that an error is displayed to the user, and the entry made in Firefox appears in Chrome.
Environment
Impact Check List
Additional Information
The text was updated successfully, but these errors were encountered: