将分支上的更改应用到主干
我目前正在从事网络应用程序开发工作。我们公司的方法是尽可能长时间地在项目主干上工作,仅在必要时才切换到分支。
但是,为了保证最近部署的成功,我直接在客户端特定分支上工作。我想知道如何将所做的更改应用到主干?
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
具体来说,听起来您想使用:
svn merge
Specifically, it sounds like you want to use: