I know there is the --reintegrate
option in Subversion (SVN) 1.6 to merge a feature branch back to the trunk.
My workflow is a little more complex:
We have feature branches - we merge trunk to them often. But we don't put them back to trunk right away. Instead we create a release branch off the trunk, and merge feature branches to release branch. At this point we get a lot of tree conflicts (since lot of changes exist both in feature branch and the trunk).
Option --reintegrate
must help in this scenario, but it looks like --reintegrate
doesn't work when merging to the branch other than trunk. Is that true?