Cut the Clutter: Test Ignore Files Feature - sign up to become a beta tester here.

Forum Discussion

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

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.

6 Replies

  • Rich's avatar
    Rich
    Icon for Super User II rankSuper User II
    8 years ago
    No. You have to compare the conflicted copies and make any necessary changes yourself.
  • Jay's avatar
    Jay
    Icon for Dropbox Community Moderator rankDropbox Community Moderator
    8 years ago

    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).

  • Gordon R.'s avatar
    Gordon R.
    Explorer | Level 3
    7 years ago

    When colleagues and I work on the same shared folder, one of the saved files is marked as a conflicted copy. How can I merge the files so that both (or more) files are meged and include the input of the other team members?

  • Jane's avatar
    Jane
    Icon for Dropbox Staff rankDropbox Staff
    7 years ago
    Hey Gordon (Gordon R. ), kindly note I’ve moved your post under this discussion here, where this inquiry has been addressed previously. From there, you could have a look at this resource here, where the raison d'être of this functionality is explained in a bit more detail. Please do let me know if you have any follow-up questions & I’ll do my best to check back with you! 
  • hellvijohan's avatar
    hellvijohan
    Helpful | Level 5
    4 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

The Dropbox Community team is active from Monday to Friday. We try to respond to you as soon as we can, usually within 2 hours.

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!