You might see that the Dropbox Community team have been busy working on some major updates to the Community itself! So, here is some info on what’s changed, what’s staying the same and what you can expect from the Dropbox Community overall.
Forum Discussion
Can you merge conflicted copies together?
Is it possible to merge conflicted copies?
- No. You have to compare the conflicted copies and make any necessary changes yourself.
Jay
Dropbox Staff
Dropbox StaffCorrect, since Dropbox wouldn’t know what file had the right data for you (nor I guess, any other program aside from the human brain).
There is a concept called 3 way merge commonly used in source control systems. That is, you use the nearest common ancestor to detect what are changes from that version and usually treat them as "correct". In this way it is possible to do an automatic merge if not the same places of the file has been modified. This is of course easier to perform on text-based files like source code than on say images or videos. See for example: https://stackoverflow.com/questions/4129049/why-is-a-3-way-merge-advantageous-over-a-2-way-merge
