开发者

SVN Merge, then rebase

I am trying to find the proper way to reintegrate the changes in my SVN branch to the trunk, and the rebase.

I have successfully merged my changes from the branch back to the trunk using,

  reintegrate merge http://mybranch into C:\code\trunk

Now i need to recreate my development branch from the trunk. What is the best way to do this?

Backgound

We basi开发者_如何学运维cally have a release trunk, and all development goes down in branches until it is time for releases, so the process is merge changes to trunk, release, rebase branch do more changes, repeat process.


Just commit the changes by the merge and create a new branch from the current trunk

svn cp ^/trunk ^/branches/NewBaseLine -m"- New Baseline"

What i missed to ask: Why do you need to "--reintegrate" ? Isn't a simple merge enough? Have you merged changes from trunk to branch before?

0

上一篇:

下一篇:

精彩评论

暂无评论...
验证码 换一张
取 消

最新问答

问答排行榜