SVN - Apply changes made on branch to trunk

Question

Hi there!

I'm currently working in a web application development. Our company methodology is to work on the project trunk for as long as possible and switch to the branches only when necessary.

However, in order to guarantee the success of a recent deploy, I have worked directly on the client specific branch. I would like to know how can I apply the made changes to the trunk?

Thanks in advance for the help, Best regards!

Answer 1

svn merge

Specifically, it sounds like you want to use:

svn merge -r N:M SOURCE [PATH]

Answer 2

Hi there!

I usually use merge when I want to apply trunk changes to a specific way. There is no problem on executing the inverse operation?

Thanks for the help, Best regards!