That's intractable. Conflict resolution has to be done differently for different types of data, so it has to be done at a higher level than filesystem, unless y

That's intractable. Conflict resolution has to be done differently for different types of data, so it has to be done at a higher level than filesystem, unless you want a special filesystem that only supports a specific kind of file or has some other very significant restrictions.