Questions tagged [svn-merge-reintegrate]

I just installed VisualSVN 3.5.6, and I'm using Tortoise SVN 1.8.11. I followed these steps: Using the VisualSVN manager I created a new repository called "test" Within this repository I created project_1/trunk and project_1/branches I checked out…

Normally, when reintegrating an SVN branch into trunk, we create a history like this: trunk A---B---D---F---H \ \ / branch C---E---G---X where G is a merge, H is the reintegration merge, and X delete the feature branch.…

We use SVN 1.6 We like to perform code merging between branches and we are in a dilemma situation. Branch A exists Folks making code changes on Branch A Branch B created from branch A Folks making code changes on both branches A and B …

I am trying to clean up this old svn repository. The project repo is very simple: /trunk/ used to be the main branch, it has been untouched since rev 531. /branches/Version2 is the new main branch, at rev 1300. It's essentially the master branch…