3 ms·

i haven't gotten a chance to test this yet, but how does dropbox do conflict resolution? ie: i'm offline at one place, make a change, offline at another place,

i haven't gotten a chance to test this yet, but how does dropbox do conflict resolution? ie: i'm offline at one place, make a change, offline at another place, make a change, go back online at both places. for text files, i suppose this could potentially implement svn-like text merging. how would that feature feel, from a design perspective? unintuitive? error prone? or excelent? edit: damn, this is a really cool app. goodbye emails to self.

pchristensen 19y ago
From FAQ: # How does Dropbox handle editing conflicts? If two users share access to a file (either through sharing the same account or within a shared folder) and a conflict between their two versions appears, the Dropbox server retains only the first version to fully make it to the server. The machines still in conflict with the server will get copies of the file with a suffix like "(Drew's local copy 1-25-2008)." Users can then manually fix the conflict and remove the extra copies of the conflicted file.