Multiple development branches with git-flow

帅比萌擦擦* 提交于 2019-11-28 21:19:12

Is this possible at all with git flow?

Anything is possible using git-flow as a series of best-practices rather than a hard rule. Just open your feature branches from your 1.0 release branch instead of from your develop branch.

More on "git-flow improved":

https://plus.google.com/109096274754593704906/posts/R4qkeyRadLR

The key is to start features from the point of last release. Whether you have 1 or more supported versions that are published should not be an issue.

UPDATE:

I have it rewritten - in blog form:

http://dymitruk.com/blog/2012/02/05/branch-per-feature/

I realize this is an old question, but I just found a fairly simple way of handling it on my end.

On my development server I basically have two working copies, one for v1.0 and another for v2.0.

I then create a separate "develop" branch for v2.0, and when I run "git flow init" on the 2.0 environment, I use this as my "next release" branch.

I am sure you could do the same for the master branch, but for my purposes this was sufficient.

I believe if you want to support two versions of app at the same time it will be better to create two different repositories for that.

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!