| Re: [cf-dev] Branching strategy |
|
I propose to create the following branches: 1)
a „master-1.x“ branch off of the 1.0.0 tag on which we develop and release the 1.x minor versions 2)
a “hotfix-1.0.x” branch off of the 1.0.0 tag on which we develop and release the 1.0.x bugifx versions Once we have created additional minor relases on the “master-1.x” branch, e.g. “1.1.0”, we can branch off additional hotfix branches off the corresponding
tags, e.g. a “hotfix-1.1.x” branch off of the “1.1.0” tag. We use “master” for development and initial release of “2.0.0”. Then we branch off a “master-2.x” branch off of that tag and so on … We only need to make sure that we merge the (relevant) changes from the “hotfix-*” to the “master-*” to the “master” branches (if applicable).
What do you think? Kai From: cf-dev-bounces@xxxxxxxxxxx [mailto:cf-dev-bounces@xxxxxxxxxxx]
On Behalf Of Kai That's what I also thought about. We should create a "1.0.0 hotfix branch" from the 1.0.0 tag on which we create 1.0.1, 1.0.2 etc and in addition to that also create a 1.x. branch for creating additional minor releases 1.1.0, 1.2.0 etc. On Thu, Jan 14, 2016 at 6:01 PM Kovatsch Matthias <kovatsch@xxxxxxxxxxx> wrote:
|