[Owncloud] Official way of dealing with conflict files.

[Klaas Freitag]

On 29.10.2012 12:36, Norman Rieß wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi,
>
> a fair amount of conflict files have errupted lately in my sync folders.
> What is the official and less destructive way to deal with them?

One has to destinguish between conflicts that are real conflicts and 
"error conflicts". Real conflicts happen if a file has changed on client 
and server between two sync runs.

There also seem to be error conditions which produce mass conflicts. The 
only way to deal with them is to fix the errors that cause them and I 
can assure you that we're working to hunt these errors down. If you can 
provide a log file of a sync run that produced the conflicts, don't 
hesitate to pass them by.

Sorry for the trouble,

Klaas