Should definitly make an article about Pijul.
Pijul is a free and open source (GPL2) distributed version control system. Its distinctive feature is to be based on a sound theory of patches. Since I know the merging hell, should give it a try.
Links / references
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information