Disclaimer: I'm relatively new to SVN. Most of my experience is with GIT.
We have a production site with all the code on an SVN trunk. I have a checked out copy that I have been making some changes to. We decided to create a branch for the feature I am building. I went ahead and checked out the branch as well. Now I have a local copy of the trunk with my changes that I need to merge into my local copy of the branch. Once I do that, I am going to discard the local trunk copy as I don't want my changes to be pushed to the production trunk.
How would I go about merging code from a local SVN folder into another local SVN folder?
P.S. I develop on Ubuntu 12.04. I have SVN Workbench installed (but I haven't really used it) and do most of my svn work via command line. If there is a linux GUI that would help with this, I'm ok with that as well.