I would like to continue in the Git branching discussion from http:Q_27382249.html
. Firstly, I would like to thank evilrix for the link to "A successful Git branching model" (http://nvie.com/posts/a-successful-git-branching-model/
My question is related to the master branch in the model. Have a look at the picture from the article:
It is quite obvious, that the hotfix should be merged to the "develop" branch as we want to fix the bug in all future versions. However, can it be always merged to the "master" branch? Think about the situation when the version 2.0 is already in the master. Then the 1.2.1 cannot be placed there and it must be kept somewhere else. In other words, how do you solve the situation when more versions must be maintained/fixed in parallel?
Thanks for your time and experience,