Hi there !
It would be great to have the possibility to manually resolve conflicts when they appears, meaning :
Let say I have few conflicts, upon syncing, I would like a window poping up (or a notification that would pop up the window) with the list of all conflicted file and the possibility, for each file, to either :
- Resolve the conflict using the file stored on the server,
- Resolve the conflict using the local file and push it to the server,
- Keep both with a conflict file, as done at the moment.
Moreover, It would be nice to also have the possibility to apply those three options to every conflicting files at once.
Finally, a small interface which would find every conflict file in the local folder of a library would be a neat feature too
Thanks for reading me, and best regards,