jducoeur

FolderShare at least does a pretty decent job with this. If one file is changed and the other not, it replicated the changed one. If both have changed, it appends the machine identifier. You have two copies, but at least it is obvious which is which, and you don't lose any modifications. It doesn't ask you to resolve anything, it leaves it up to you to do that whenever you get around to it.