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)

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.