...
- At the moment the one with greater CSN (i.e. the more recent) will be retained just like with any conflicting modification. The older entry is lost - it would be useful if it were moved to a lost+found area and an administrator notified in some way.
2. When one server deletes an entry while another server adds a child entry below at the same time, what do we do to resolve the conflict? - On a single server a delete followed by a child entry add would give an error, as would a child entry add followed by a delete. Perhaps this means we should just discard the second operation?