i quickly tested sharing a file with a colleague today using dropbox, which is cloud-based disk storage. after an exchange and acceptance of invites, a new folder is created in your dropbox. each party has read/write access. when a file is edited simultaneously, two versions (see below), accessible to each party are created. differences must be handled independently; it would be quite a bit to ask to have changes merged.
all in all, quite nice.


