Hacker News new | ask | show | jobs
by PurpleRamen 2822 days ago
I don't think there is much code for conflict-resolving in dropbox. Usually in case of conflicts it renames one of the involved files and add a message about conflict and the date to the name and moves on.
1 comments

Perhaps there's lots of code to minimize the number of times a real conflict occurs?