I didn't understand what dropbox was until I went to www.dropbox.com. File conflict handling is mentioned at https://www.dropbox.com/help/36
People have made scripts and utilities to get a list of conflicts. There's also a Windows add on to do merges.
People have made scripts and utilities to get a list of conflicts. There's also a Windows add on to do merges.