Search code examples
svnbranchtrunk

Apply changes made on branch to trunk

I'm currently working on 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?

Solution

  • svn merge

    Specifically, it sounds like you want to use:

    svn merge -r N:M SOURCE [PATH]