We are using TFS and believe we need to use branching and merging. We are 2 developers working on one website, we are in 2 geographical locations and are using www.visualstudio.com
to host our TFS. We want to keep the main trunk as an exact replica of the production website.
Our plan is for every new sprint (monthly approx.) we will create a branch called “website-sprint001” etc. We will work on the sprint in our separate locations and checkin our work to the branch periodically throughout the sprint (month) to in affect save the code so the other can see it. When we are happy with the final code we will merge back the trunk and release to the production website. Is this the correct use of branching and merging? Is there a better way to handle our situation?