How to find conflicts? 'There are unresolved conflicts'

[frankferrari]

Hey there!
My Opencloud clients show 'There are unresolved conflicts' and I cant figure out how to find (and fix them). Cant see anything in the docker logs..
How would be the way to go?

[micbar]

Conflicts occur when both, the file on the client and on the server have changed.

that is expected during heavy use. It can be avoided when using collaborative web office solutions like collabora.

When the client detects a conflict, it creates a file with the .conflict extension locally and the original filename as name. The user can now resolve that issue by choosing one of the files.

[Nurgak]

It would be nice to get a more descriptive message, as the main window only shows "There are unsolved conflicts", without showing where the conflicts are. The "Activity" tab does not show anything useful either.

In my opinion, the app, in its current state, could be a simple tray icon.

[micbar]

@Nurgak
Maybe one important design decision.

This client which shares its history with owncloud, nextcloud and openCloud has the main purpose to keep remote files with local files in sync. The main user interface is the file browser itself, you can see the sync state of every file through the overlay icon.

And you are correct, the client is „just a tray icon“

The sync conflicts occur naturally because server side changes and local changes cannot just be „merged“ blindly. So the user sees a conflict immediately in the file explorer because there are two files now, the server side version and the local version and the user can choose. The conflict is resolved when the .conflict file is renamed.

You might argue that it would be handy to be able to find the conflict files easier from the client UI with a pointer to the file explorer.

[aeisan18]

Not an attempt to merely clone NC or another app, but the way the NC client implements selecting which file to keep when there is a conflict is much cleaner in my opinion. Had to search for this issue just to figure out how to fix it, which is not very intuitive.