Hi Ander, AFAIK, OC uses mtime of the file (and sometimes byte to byte comparision) to detect confliction. I get this information from a recent discussion in ML: http://owncloud.10557.n7.nabble.com/Hate-to-say-it-but-tp9119p9129.html
Maybe someone else here can give you a link for official documentation on this topic :) Do you plan to sync marble data to OC using the file synchroniztion feature of OC or write a dedicate synchroniztion app? houqp On Thu, May 2, 2013 at 9:35 AM, Ander Pijoan <[email protected]> wrote: > Hi everyone, > > I was preparing to work on a GSoC this year trying to integrate Marble into > ownCloud > (http://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/anderpijoan/18001). > > One of the questions I have about ownCloud is if there is some kind of > collision detecting/solving system and how it works. > > I've been doing some tests with the online editor and if there are some > people changing the same document, when trying to save it will tell "Failed > saving", but don't have much idea about how it works when synchronizing or > uploading a changed file. > > Thanks in advance. > > -- > Ander Pijoan Lamas > Research Assistant, Deustotech > Computer Science Engineer > University of Deusto > > E-mail: [email protected] > Phone: +34 664471228 > in: http://www.linkedin.com/profile/view?id=162888312 > > _______________________________________________ > Owncloud mailing list > [email protected] > https://mail.kde.org/mailman/listinfo/owncloud > _______________________________________________ Owncloud mailing list [email protected] https://mail.kde.org/mailman/listinfo/owncloud
