nextcloud / desktop

💻 Desktop sync client for Nextcloud

https://nextcloud.com/install/#install-clients

GNU General Public License v2.0

3.01k stars 793 forks source link

Easier conflict resolving #5432

Open JustRedTTG opened 1 year ago

JustRedTTG commented 1 year ago

How to use GitHub

Please use the 👍 reaction to show that you want to have the same feature implemented.
Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
Subscribe to receive notifications on status change and new comments.

Feature description

Resolved conflict should go away when resolved, maybe bundled into another screen for easier resolving

LuisCane commented 1 year ago

A way to select all or multiple conflicts and resolve them in the same way would go a long way in clearing conflicts efficiently.

camilasan commented 1 year ago

5635

juliusknorr commented 6 days ago

I noticed this is still quite cumbersome if you have multiple conflicts, even after selecting to accept the server version for all conflicts, i need to manually confirm each individual file:

https://github.com/user-attachments/assets/09848bdc-351e-48d8-b4ed-cb8bbc5ba960