In short, I essentially created a development branch inside our trunk.
About two weeks ago, I decided that it would make sense to create a separate branch in our repository, since we will finally move to the visual studio 2010. I have not read as many subversion books as I should have.
Here's the basic structure:
REPO/
Installer/
Utilities/
Main/
Upgrade/
Installer/
Utilities/
Main/
Where the update is the branch I created. Some changes were made to Main, as well as a whole bunch of tree and file changes during the update process. What is the best strategy to merge is clean?
Many thanks!
source
share