Actually, this is one of my favorite features of Dropbox. It may occasionally make me do some additional work to merge files, but it's worth it for the peace of

Actually, this is one of my favorite features of Dropbox. It may occasionally make me do some additional work to merge files, but it's worth it for the peace of mind: I know that Dropbox will never delete anything I don't want it to or erase history I want left intact. Automatic merging isn't generally useful for things besides code, and if your using Dropbox for managing code you probably want to use a real SCM.