Due to some mismanagement of our SVN repository, we ended up making a branch, named Stable, containing a stable build of our code (the branch actually got started from a tag of the last release, rather than the trunk).
Basically trunk has been 'infected' by some changes made by our new programmer, who didn't really know what they were doing.
What I want to achieve is making the stable branch the trunk, discarding all these changes since the branch occurred, however I need to make sure I preserve all the history pre branch.
Does the branch contain all the history prior to the branch occurring? (in which case I think I can just move the branch to become the trunk?)
All tutorials I can find talk about merging .. But I'm nervous about that because if my understanding is correct, if there are changes in trunk that do not happen to conflict, I would end up with these in the stable build.
So the question is what is my best option for this situation?
Thanks in advance for your input!