Apply changes made on branch to trunk

StackOverflow https://stackoverflow.com/questions/2336456

  •  22-09-2019
  •  | 
  •  

문제

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?

도움이 되었습니까?

해결책

svn merge

Specifically, it sounds like you want to use:

svn merge -r N:M SOURCE [PATH]
라이센스 : CC-BY-SA ~와 함께 속성
제휴하지 않습니다 StackOverflow
scroll top