Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use setContent for collision resolution #233

Closed
juliushaertl opened this issue Aug 12, 2019 · 3 comments
Closed

Use setContent for collision resolution #233

juliushaertl opened this issue Aug 12, 2019 · 3 comments

Comments

@juliushaertl
Copy link
Member

Since tiptap 1.23.2 setContent will dispatch a transaction, so we could preserve the collaboration history with that even when we apply changes from the file from outside:

https://github.com/scrumpy/tiptap/releases/tag/tiptap%401.23.2

@juliushaertl
Copy link
Member Author

@max-nextcloud This would be interesting to reevaluate with the ongoing y.js work if we can resolve the manual file overwrite outside of text more nicely by applying the new document on top of the existing editing session.

@max-nextcloud
Copy link
Collaborator

Just talked about this with @juliushaertl. Some points to note:

  • if we make locking mandatory (maybe including the locking app in server by default) there would be no need for collision resolution anymore.
  • we could improve collision resolution by having one party handle it while the others keep editing using setContetn if the server side version is chosen
  • The current version is currently mostly made read only to prevent overwriting the server side file. We could keep the editing alive if we managed to save the conflicting files in different places.

@juliushaertl
Copy link
Member Author

Was done with 7512ef2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants