Skip to content

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

Merged
mgallien merged 1 commit into
masterfrom
feature/yes-to-all-conflictsdialog
May 9, 2025
Merged

gui: add a "Yes to all" button when resolving multiple conflicts at once#8044
mgallien merged 1 commit into
masterfrom
feature/yes-to-all-conflictsdialog

Conversation

@nilsding

Copy link
Copy Markdown
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
@nilsding
nilsding marked this pull request as ready for review March 20, 2025 16:02
@sonarqubecloud

Copy link
Copy Markdown

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

@github-actions

github-actions Bot commented Apr 5, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

3 similar comments
@github-actions

github-actions Bot commented Apr 6, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@github-actions

github-actions Bot commented Apr 7, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@github-actions

github-actions Bot commented Apr 8, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@nilsding
nilsding force-pushed the feature/yes-to-all-conflictsdialog branch from d47a985 to cf4b370 Compare May 6, 2025 10:25
Fixes #7446

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
@mgallien
mgallien force-pushed the feature/yes-to-all-conflictsdialog branch from cf4b370 to e75defd Compare May 9, 2025 15:54
@github-actions

github-actions Bot commented May 9, 2025

Copy link
Copy Markdown
Contributor

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

SHA256 checksum: 121009f5e051054ef8b5c46dec053a501af3198f74a8b8f3e78ec1eed7b58cbe

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.

@mgallien
mgallien merged commit d2712e8 into master May 9, 2025
@mgallien
mgallien deleted the feature/yes-to-all-conflictsdialog branch May 9, 2025 16:27
@sonarqubecloud

sonarqubecloud Bot commented May 9, 2025

Copy link
Copy Markdown

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

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

2 participants