Gitflow Workflow | Atlassian Git Tutorial:

Mary finishes the release

Once the release is ready to ship, Mary merges it into master and develop.

And she does that because she's not on TFS 2010, which only (afaict) allows one generation's worth of relationships.

In gitflow, green is orange's child.  So is yellow.  In TFS, Sister Yellow would have to merge into Father Orange, and then Father Orange would have to merge into Brother Green to have the complete chain of inheritance.

That's insane.  In git, you can be someone's great grand-cousin dodecahedrically removed and still merge into anyone you wanted. 

Please avoid any jokes about the south.

Labels: ,