Gitdocs
Open-source Dropbox using Ruby and Git
...Git provides merging and historical tracking, while conflicting document versions are preserved for manual resolution when automatic merging fails. The project is particularly suited to notes, wikis, plans, code snippets, and other text-oriented collaborative material.