We are aware of the issue with the badge emails resending to everyone, we apologise for the inconvenience - learn more here.
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.
- Rich
Super User II
No. You have to compare the conflicted copies and make any necessary changes yourself.- Jay
Dropbox 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).
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
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
Hola,
nosotros también tenemos este problema y estoy intentando llegar a los suficientes votos para que Dropbox haga cambios ya con este tema, ayúdame con un voto más en este enlace del mismo foro de Dropbox y veremos a ver si así nos hacen caso.
Gracias 🙂
