On 07.06.2015 08:35, Branko Čibej wrote: > * When you're ready to begin stabilization for a release, create a > release branch (rel-1.2.x for example) from the master branch. Only > bug fixes happen on the release branch. When you're happy with the > stability of the release, just tag the release branch (e.g., 1.2.0) > and publish. This now becomes the bugfix branch for the 1.2.x release. > o Its up to you to decide how you fix bugs on the release branch; > there are basically two ways to do this: > + Fix all bugs on master and cherry-pick them to the release > branch(es). This is the preferred method because it ensures > that all bug fixes are present in all future releases. > + Fix bugs on the release branches and merge them back to > master. This works but
... requires careful tracking of which bugfix was merged to trunk and whether or not it was propagated to the other release branches, as appropriate. -- Brane
