I have the following branches in TFS
Dev\2.3.0-Printing was branched off of Main and after completing and testing was merged back up into Main, which was then branched into Rel\2.3.0.
A bug has been found in 2.3.0 so I'm trying to figure out a branching strategy for 2.3.1 which will include the bug fix.
I was told by a previous co-worker who seemed fluent in TFS to branch from Rel\2.3.0 into Dev (ie, don't use the existing/old/previous 2.3.0-Printing branch), so I'm thinking of calling it Dev\2.3.1-Printing.
Or, should I first branch Rel\2.3.0 to Rel\2.3.1, then fork a Dev\2.3.1 branch that can later be merged back into Rel\2.3.1, effectively making Rel\2.3.0 the "Main" of all 2.3 revisions?
Branching off of Main is no longer an option since there have been additional releases since 2.3.0, which would result in a branch that included these newer changes.
The bug fix needs to make it's way back up into Main and I'm thinking it's probably a good idea to avoid circular branch relationships.