Flexible and Safe Resolution of File Conflicts.

Puneet Kumar, Mahadev Satyanarayanan

Browse the full USENIX paper archive.