You might want to look at this bit: https://github.com/hbons/SparkleShare/blob/master/SparkleLib... It tries to copy the Dropbox conflict behaviour.
SparkleShare doesn't require any special server side parts: just git-core, which may be easy or hard to set up depending on your sysadmin skills.
You might want to look at this bit: https://github.com/hbons/SparkleShare/blob/master/SparkleLib... It tries to copy the Dropbox conflict behaviour.
SparkleShare doesn't require any special server side parts: just git-core, which may be easy or hard to set up depending on your sysadmin skills.