desktop icon indicating copy to clipboard operation
desktop copied to clipboard
verified publisher icon nextcloud

Easier conflict resolving

Open RedTTG opened this issue 2 years ago • 3 comments

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

RedTTG avatar Feb 12 '23 08:02 RedTTG

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

LuisCane avatar Feb 15 '23 16:02 LuisCane

#5635

camilasan avatar May 15 '23 13:05 camilasan

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

juliusknorr avatar Oct 14 '24 07:10 juliusknorr