fix(auto-upload): handle conflict and sync conflict#16788
Merged
alperozturk96 merged 2 commits intomasterfrom Apr 1, 2026
Merged
fix(auto-upload): handle conflict and sync conflict#16788alperozturk96 merged 2 commits intomasterfrom
alperozturk96 merged 2 commits intomasterfrom
Conversation
alperozturk96
force-pushed
the
fix/auto-upload-conflict
branch
from
d915e83 to
48874bd
Compare
AndyScherzinger
approved these changes
Apr 1, 2026
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
alperozturk96
force-pushed
the
fix/auto-upload-conflict
branch
from
bab6835 to
b6ffc7a
Compare
|
APK file: https://github.com/nextcloud/android/actions/runs/23845901353/artifacts/6219244835 |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
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.
Issue
Client is not handling
CONFLICTerror code same asSYNC_CONFLICTUpload Finished [❌] | RemoteCode: CONFLICT | internalResult: CONFLICT_ERROR |