News for hackers. Stuff that matters.
Re:Dropbox clone with git, ssh, EncFS and rsync.net by nuclear_eclipse on Tuesday October 15, 2013 @01:31PM (#6554806)
Does this make any attempt to handle conflicts on files when changed on two offline hosts? I assume since it's based on Git it will just try to do merges that way, but how does it handle conflicts that can't be automatically resolved?

There are no comments on this comment yet.