Simplify the file conflict dialog - #2151
Open
jancborchardt wants to merge 1 commit into
Open
Conversation
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Jan C. Borchardt <925062+jancborchardt@users.noreply.github.com>
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #2151 +/- ##
==========================================
- Coverage 36.30% 35.47% -0.83%
==========================================
Files 17 18 +1
Lines 774 792 +18
Branches 145 150 +5
==========================================
Hits 281 281
- Misses 480 498 +18
Partials 13 13 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
1 task
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-dialogs#2540
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)