Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: add a "Yes to all" button when resolving multiple conflicts at once #8044

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

nilsding
Copy link
Member

A quick one for 3.17 :)

(Legacy) QWidget conflict dialog QML-based conflict dialog
single file only single file multiple files

Screenshot_20250319_093101

Screenshot_20250319_093249

Screenshot_20250319_093629

Fixes #7446

@nilsding nilsding added this to the 3.17.0 milestone Mar 19, 2025
@nilsding nilsding self-assigned this Mar 19, 2025
@nilsding nilsding marked this pull request as draft March 19, 2025 10:29
@nilsding nilsding force-pushed the feature/yes-to-all-conflictsdialog branch from cdd1250 to d47a985 Compare March 20, 2025 15:39
Copy link

Artifact containing the AppImage: nextcloud-appimage-pr-8044.zip

SHA256 checksum: 52ac6dbbd4881032e2e20f81021ccb7aa32d5e494d40bfdb571382cb9faf782f

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

@nilsding nilsding marked this pull request as ready for review March 20, 2025 16:02
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
6 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add the Yes to all - button to delete all conflicted files
1 participant