Quote Originally Posted by marcvanriet View Post
I was just hoping that something similar (or a better alternative) would already exist.
You can use some revision control system (like subversion) as your network backend. It would do all merges that can be done for you and would report conflicts that you could translate in a "user-friendly" way to your users.