I have a lot of conflicts in a working copy that has been merged to, I know that each of them want to be resolved to the right side of the merge. Is it possible to do this in bash/terminal on OSX, for example (in pseudo code:)
find . -name '*.merge-right.*'
rm original-filename.filetype
cp original-filename.filetype.merge-right.r123 original-filename.filetype
svn resolved original-filename.filetype
I know the filetypes of all these files and they're all the same if that helps?