[PLUG] Unison/rsync/git for three way file sync

[Jason LaPier]

On Mon, Jan 16, 2012 at 1:09 PM, Keith Lofstrom <keithl at kl-ic.com> wrote:

>
> Another possibility is using a wrapper aroung git.  That
> has the behavior I want (including harmonizing versions
> with asynchronous changes), but git itself is a little
> daunting for the average non-geek.<http://lists.pdxlinux.org/mailman/listinfo/plug>
>

I haven't tried this out yet, but for easy syncing with git, there's
SparkleShare - the idea being that it's a git-based alternative to DropBox,
with a desktop client that will sync to one or more git repos for you:
http://sparkleshare.org/

- Jason L