I have a dev branch that hasn’t been touched for a while. I merged the trunk into it to integrate many fixes/changes in the main line since it was branched out, but now I have many small conflicts (merge-left/merge-right).
I want the latest trunk revision to be used to resolve each conflict. Is there a command I can run that will resolve all conflicts under a working copy in one direction automatically (merge-right should be used for all conflicts)?
EDIT: As indicated in the comments, I tried reverting and then running svn merge with the –accept option, only apparently there is no such option in SVN 1.0. Still looking for a solution.
I think you can use the ‘–accept theirs-full’ option when you issue the svn merge command. That should do what you want…