Menu
In subversion I made a branch now I want to merge it back into trunk. Which option should I use?
Reintegrate a branch
or
merge a range of revision
I was using Merge a range of revisions, but I was getting all sorts of tree conflict errors. Any idea what the difference is between these two?
973
It never should have been committed. You can use svn merge to “undo” the change in your working copy, and then commit the local modification to the repository. All you need to do is to specify a reverse difference.
Basically that means a temporary clone of the (feature) branch is created, a sync merge is made from the parent branch to the temporary branch, and finally the parent branch is replaced by the temporary branch. In other words, the temporary branch contains all changes made to the (feature) branch and parent branch.
When working with a branch, you should periodically merge ranges of revisions from the trunk into the branch to keep the branch in sync. if you don't pass any version numbers to svn merge and your svn server version is 1.5 or newer, it will track the merges you've previously done and automatically merge only newer revisions.
When the branch is finished, you should merge changes into it one last time, then reintegrate it back into the trunk.
86
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
