Data Browser - Viewing Site  Sector 23 Code Bank Logged in as:  Guest  




           


TFS/Git Branching Strategy
Simplest is best. Minimizing merges will result in fewer complicated bugs/inadvertently lost code.

There should be one master/main branch representing the latest code.

Small/iterative changes should be made in master.

Large features can be made in a one-off feature branch and merged into master as soon as possible (when stable).

The more everyone is in master the better, as it minimize situations where feature branches diverge and the later inventible merge becomes a nightmare.

When ready for a release, create a branch for that release. Create a branch for each new major release. Delete when no longer needed (e.g. 3 releases out of date).

More here: https://docs.microsoft.com/en-us/azure/devops/repos/git/git-branching-guidance?view=azure-devops

Created By: amos 9/28/2020 9:14:37 AM
Updated: 9/28/2020 9:15:45 AM