We are aware of the issue with the badge emails resending to everyone, we apologise for the inconvenience - learn more here.

Forum Discussion

Joan P.12's avatar
Joan P.12
New member | Level 2
7 years ago

Can you merge conflicted copies together?

Is it possible to merge conflicted copies?
FAQ
Sync
  • Rich's avatar
    Rich
    7 years ago
    No. You have to compare the conflicted copies and make any necessary changes yourself.
Jay's avatar
Jay
Icon for Dropbox Staff rankDropbox Staff

Correct, since Dropbox wouldn’t know what file had the right data for you (nor I guess, any other program aside from the human brain).

hellvijohan's avatar
hellvijohan
Helpful | Level 5
3 years ago

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

About Create, upload, and share

Find help to solve issues with creating, uploading, and sharing files and folders in Dropbox. Get support and advice from the Dropbox Community.

Need more support

If you need more help you can view your support options (expected response time for an email or ticket is 24 hours), or contact us on X or Facebook.

For more info on available support options for your Dropbox plan, see this article.

If you found the answer to your question in this Community thread, please 'like' the post to say thanks and to let us know it was useful!