0

Discussing TFS merge and branch guideline internally, some team member suggest only leaves one release branch, and 'keep it aligned with production' by implementing the hotfixes and services packs there. My thinking is to create multiple release branches basically each mapped out to a development branch and merge to main, essentially main aligns to production. Could someone suggest which route should we go here?

TOMMY WANG
  • 1,382
  • 3
  • 16
  • 39

1 Answers1

1

In your scenario your team creates a branch to stabilize the release and then merges the release branch back into the main source tree after the software is released. The following is a view showing branching for releases, suggest you to use this schema :

 Your Team Project

└ Main → Main integration branch

│   └ Source

└ Releases → Maintenance branch container

   └ Release 1 → Maintenance branch

   │      └ Source

   │      └ Other Asset Folders

   └ Release 2 → Maintenance branch

          └ Source

          └ Other Asset Folders

enter image description here

PatrickLu-MSFT
  • 49,478
  • 5
  • 35
  • 62
  • In my opinion, in this Architecture, you could add Feature branch for your development ,then merge it to Main Branch. Then develop your code in the feature branch. Please see my updated picture. – PatrickLu-MSFT Jan 15 '16 at 10:26