Recently, we release a new version of our product and created a branch of our main source tree. Last week I made a change in our development branch that I needed to merge into our release branch as well. Using the merge wizard in the Team Explorer from...