• We’re currently investigating an issue related to the forum theme and styling that is impacting page layout and visual formatting. The problem has been identified, and we are actively working on a resolution. There is no impact to user data or functionality, this is strictly a front-end display issue. We’ll post an update once the fix has been deployed. Thanks for your patience while we get this sorted.

Subversion clobber merge?

J

joejld1

Member
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
 
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?
 
Originally posted by: joejld1
Hi,

... overwriting everything in a branch with source from another branch.
Click to expand...

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?
 
You must log in or register to reply here.

TRENDING THREADS

Back
Top