Geek Answers Handbook

How to work with two major versions using the GitFlow model

We have been working using the GitFlow model using function / release / fix branches for some time. Now we are going to introduce the main function, which can take several weeks to develop and lead to a significant update of the version, and we want to save our current workflow for this important function (thus, not using any branch where everyone is fixed directly), so and also the current version.

I am wondering what is the best approach for this. Would it really be to unlock the entire repo and then merge with the original? How can we support both major versions in active development and workflows with 1.x and 2.x gitflow at the same time?

As a side solution, the remote repository is hosted on github, so deploying the entire repo under a specific user, rather than a group, seems inconsistent.

+4
source share
1 answer

General comments to clarify to users who are not familiar with the git stream, git flow is open source, so you can modify the stream and customize it according to your needs.

Based on the previous comment, you have several options for how to proceed from here:

  • , github - . git support , .
    github fork / dev , , -.

  • git, , ( " , , " ), , , gitflow.

  • , " , " " .

:
git, , , , , .
gitflow , 2 . , dev, dev, .

+1

More articles:


All Articles