Simplify the file conflict dialog - #2540
Merged
Merged
Conversation
1 task
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2540 +/- ##
=======================================
Coverage 59.16% 59.16%
=======================================
Files 15 15
Lines 453 453
Branches 95 94 -1
=======================================
Hits 268 268
Misses 164 164
Partials 21 21 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
susnux
reviewed
Jul 31, 2026
kra-mo
previously requested changes
Aug 3, 2026
kra-mo
left a comment
Member
There was a problem hiding this comment.
Nice, but some other things that we might as well change:
- "Incoming" I guess means the same as "new"? Probably good to keep the wording consistent.
- It would be nice to also change the padding for the buttons on the bottom to be consistent on the sides and the bottom.
Contributor
Yes incoming are either
|
jancborchardt
force-pushed
the
feat/simplify-conflict-dialog
branch
3 times, most recently
from
August 4, 2026 00:04
d8d7180 to
26c284d
Compare
Contributor
Author
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Jan C. Borchardt <925062+jancborchardt@users.noreply.github.com>
jancborchardt
force-pushed
the
feat/simplify-conflict-dialog
branch
from
August 4, 2026 00:15
26c284d to
7b7c979
Compare
susnux
approved these changes
Aug 4, 2026
kra-mo
approved these changes
Aug 4, 2026
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
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.
Same as nextcloud-libraries/nextcloud-upload#2151
Our current file conflict dialog (when you upload the same file again) immediately jumps into a very complex "pick files" view.
Based on a mockup by @kra-mo and some discussions.
The improvements:
We could probably simplify the wording even more for the multiple files case, but this PR is also quite big already. :)
Mockup by @kra-mo for reference
🤖 AI (if applicable)