Just wanted to dump a quick how-to on doing branch to trunk merges in VS Team. It is pretty simple really, only a few steps. Pull the latest of the branch to your local disk Pull the latest of the trunk to your local disk Merge and Pray (more on this at a later date) Yea sounds pretty easy right.......

Before I get started, I personally am a fan of using #regions in my code.  I think it cleans up everything, allowing me to only see what I want to see.  I also know that many of you disagree with me, and that is fine. Here are 2 posts that voice their disapproval for regions if you are interested...