简体   繁体   中英

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 basically 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?

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM