Regarding branching/merging strategy this may help give you an idea of the options. I've used some of their stuff when setting up a strategy for merging/branching.
Version Control Guide (ex-Branching & Merging) - Downloads
A common approach is to have a dev, main and release(s) branches.
Work in dev, then merge to main. Dev is deployed to your dev area, main is deployed to your test area.
People can continue to develop in the dev branch whilst main is left alone and is ready for proper testing.
When you are happy you can then deploy to production from main and create a release branch. Hotfixes are made in your release branch and merged down to main/dev. Some clients have staging areas others use the test area as staging.
A good tool for merging is
Beyond Compare. I recommend this tool!
A good guide for
integrating it with Visual Studio..
I've recommended Pluralsight before but I've not used any of their TFS vids.
Check em out.