Subversion clobber merge?

[joejld1]

Hi,

Is there an way to merge two branches without caring about conflicts? More like, overwriting everything in a branch with source from another branch.
I've researched the svn merge option -ignore ancestry but that doesn't seem like what I'm looking for. And I'm not too clear on the -force option either.

Thanks for any help

 

[troytime]

if you want to ditch a branch, ditch the branch

are you saying both branches have new code, but you want to merge them and have branch1 be the official code if there are merge conflicts?

 

[degibson]

Originally posted by: joejld1
Hi,

... overwriting everything in a branch with source from another branch.

Perhaps I'm not understanding you, but why don't you just blow away all the source in the target branch and then svn update to get the changes from the source?