Moving test site to main site

Hi,

Hope someone can help, because I’m at lost here.

I had a main website <mydomain.net>, but wanted to change the theme while keeping the main site active while working on the new one.

So, I added a second installation of WP to my current site by adding a new directory <mydomain.net/test> in my root directory. I uploaded the new template I wanted to work on into the themes folder of that new installation.

In trying to move <mydomain.net/test> to <mydomain.net> once I was done, I screwed up something in <mydomain.net> (I have no idea what), and ended up having to erase my install of WP on <mydomain.net> and installing a new one (which is currently mostly empty).

For the time being, and because I need my site to be up, I’ve redirected <mydomain.net> to <mydomain.net/test>.

My question: how do I move <mydomain.net/test> with all its files to <mydomain.net>?

Thanks.