fix(auto-upload): handle existing sync conflicts #16273
Open
Conversation
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
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
alperozturk96
force-pushed
the
fix/re-trigger-auto-upload-file-has-conflict
branch
from
7b431b7 to
72af6e4
Compare
Collaborator
Author
|
/backport to stable-3.35 |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16273.apk |
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue: #16126 (comment)
When a sync conflict occurs during auto-upload, the client repeatedly retries uploading the same file. This results in the user seeing the same conflict notification multiple times, even though the conflict already exists and requires manual resolution.
Changes
After the first auto-upload attempt that results in a sync conflict, the file is marked as handled by the auto-upload system. This prevents further automatic retries for the same file. The conflicted upload remains visible in the Uploads list, where the user can manually resolve the conflict or retry the upload if desired.