fix/no conflicts on sync - #9149
Merged
Merged
Conversation
max-nextcloud
force-pushed
the
fix/no-conflicts-on-sync
branch
7 times, most recently
from
September 2, 2026 03:20
51750af to
ee78ca4
Compare
max-nextcloud
marked this pull request as ready for review
September 2, 2026 03:35
30 tasks
This reverts commit a4eeb24. Signed-off-by: Max <max@nextcloud.com>
The document may be in the middle of getting saved. When the file has been updated but the metadata in the documents table has not it may seem like the file was overwritten even though text is saving the file. This does not indicate an actual conflict. Avoid triggering the conflict screen in that race condition. Signed-off-by: Max <max@nextcloud.com>
We observed save requests that took longer than 30 seconds. The lock needs to outlive those in order to prevent superfluous 409 responses. Signed-off-by: Max <max@nextcloud.com>
Abort autosave if another save is still under way. We observed save requests taking up to 30 seconds. In this timespan autosave requests would still be processed as the lastSavedTime in the database has not been updated yet. Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
fix/no-conflicts-on-sync
branch
from
September 2, 2026 04:05
ee78ca4 to
d331c8f
Compare
Collaborator
Author
|
/backport to stable35 |
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix(sync): do not check for conflicts during sync
The document may be in the middle of getting saved.
When the file has been updated
but the metadata in the documents table has not
it may seem like the file was overwritten
even though text is saving the file.
This does not indicate an actual conflict.
Avoid triggering the conflict screen in that race condition.