When two devices modify the same file, Dropbox renames the older copy to filename (User’s conflicted copy YYYY-MM-DD).ext . No automatic merge except for Office files (via Microsoft co-authoring integration).
Have you ever been on a plane or a train with spotty Wi-Fi and needed an important PDF?
