Must a feature branch be deleted after it's merged (reintegrated) back to trunk? I prefer to constantly merge changes back and forth from my feature branch - I believe this keeps the conflicts to a minimum. Yet I understand that once you use the reintegrate merge to trunk, a feature branch should be deleted. Is it so? Why? What can I d...
If you always sync a feature branch before you merge it back, why do you really have to use the --reintegrate option? The Subversion book says: When merging your branch back to the trunk, however, the underlying mathematics is quite different. Your feature branch is now a mishmosh of both duplicated trunk changes and private branch ...
I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get the following error message: Command: Reintegrate merge https://dev/svn/branches/devel i...
Hi, I have read quite a bit about the need to re-integrate when you merge from a branch back to the trunk in SVN (This article was really helpful http://blogs.open.collab.net/svn/2008/07/subversion-merg.html). The problem seems to come from the fact that people are regularly updating the branch from the trunk which means that the final...
I've got a big-ish project that needs a lot of work on a new feature, so I planned on using a branch to do this work. I haven't had to do this before, and I just wanted to get assurance from an experienced Subversion user that things "should" work smoothly. What I'm especially concerned with is how well Subversion handles deleted, renam...
We use TortoiseSVN on Windows and VisualSVN server. I just completed the merge and reintegration of a feature branch back into trunk. The experience wasn't as smooth as I'd hoped and I have some questions based on my experience. 1) Merging trunk changes into branch. I went through and identified all of the repository revisions that a...
Hi, I've been trying to get my head around SVN merging/reintegrating and have read a these articles/books: http://svnbook.red-bean.com/en/1.5/index.html http://blogs.open.collab.net/svn/2008/07/subversion-merg.html I obviously haven't quite got it, as I can't see why including synched revisions in a merge back to trunk (reflective/cyc...