cancel
Showing results for 
Show  only  | Search instead for 
Did you mean: 
Announcements
Want to learn some quick and useful tips to make your day easier? Check out how Calvin uses Replay to get feedback from other teams at Dropbox here.

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.

cancel
Showing results for 
Show  only  | Search instead for 
Did you mean: 

Re: conflicted copies

Can you merge conflicted copies together?

Joan P.12
New member | Level 2
Go to solution

Is it possible to merge conflicted copies?

1 Accepted Solution

Accepted Solutions

Rich
Super User II
Go to solution
No. You have to compare the conflicted copies and make any necessary changes yourself.

View solution in original post

6 Replies 6

Rich
Super User II
Go to solution
No. You have to compare the conflicted copies and make any necessary changes yourself.

Jay
Dropbox Staff
Go to solution

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


Jay
Community Moderator @ Dropbox
dropbox.com/support


Heart Did this post help you? If so, give it a Like below to let us know.
:arrows_counterclockwise: Need help with something else? Ask me a question!
:pushpin: Find Tips & Tricks Discover more ways to use Dropbox here!
:arrows_counterclockwise: Interested in Community Groups? Click here to join!

Gordon R.
Explorer | Level 3
Go to solution

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
Dropbox Staff
Go to solution
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! 

 


Jane
Community Moderator @ Dropbox
dropbox.com/support

 

Heart Did this post help you? If so please give it a Like below. 
:white_check_mark: Did this post fix your issue/answer your question? If so please press the 'Accept as Best Answer' button to help others find it.
:arrows_counterclockwise: Still stuck? Ask me a question! (
Questions asked in the community will likely receive an answer within 4 hours!)

mcosta_
Explorer | Level 4
Go to solution

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 🙂

 

Advertencia de que otros usuarios ya tienen un autocad f... - Comunidad de Dropbox (dropboxforum.com...

hellvijohan
Helpful | Level 5
Go to solution

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

Need more support?