You develop a solution that is managed in MicrosoftVisual Studio Team Foundation Server (TFS) source
control using three branches according the following table.
The branch hierarchy is shown in the exhibit. (Click the Exhibit button.)
A new project requires you to divide your team intotwo separate, and largely independent, teams named
Feature Team 1 and Feature Team 2. Each team works on different features.
You need to recommend an effective long-term strategy that:
· Allows parallel development,
· Allows independent feature releases,
· Minimizes conflicts,
· Supports integration, and
· Allows bug fixes to production code.
What should you do?
A.
Instruct both feature teams work off the DEV branch. The teams should only check in when they are ready
to integrate.
B.
Create two new folders named FB1 and FB2 at the same level as the other branches. Instruct Feature
Team 1 to check in to FB1 and Feature Team 2 to check in to FB2. When the teams are ready to integrate,
perform baseless merges from FBI to DEV and FB2 to DEV.
C.
Instruct Feature Team 1 to check in to the DEV branch and Feature Team 2 to check in to the MAIN
branch. When the teams are ready to integration, the DEV branch will be merged into the MAIN branch.
D.
Create two branches off DEV named FB1 and FB2. Instruct Feature Team 1 to check-in to FB1 and
Feature Team 2 to check-in to FB2. When a team is ready to integrate, FB1 or FB2 will be merged with
DEV.