Choosing a branching model for Git?

Question

git

In our project, we use Git as a VCS with a similar branching model. However, this model does not suit us, because it assumes releases with predefined functionality.

Our project has historically developed a different mechanism of work: “features” are developed in parallel, while it is not known in advance how soon this or that feature will be needed in production. In the case of the model mentioned above, we get problems with the transfer of developments from the develop branch to the master branch, because, often, “features” intersect with each other. This is due to the fact that the "feature" branches are generated from the develop branch, which at some point in time begins to greatly outpace the master branch.

I would be grateful for links to various branching models that differ from the one mentioned. Unfortunately, Google for the most part offers it in its issuance. I would also be grateful for any practical advice.

Answer 1

So maybe not have a develop branch, but have master and for each feature branch?

Answer 2

with us, each feature is branched from the master, and in general everything is branched from the master, releases are assembled from feature / bug branches at any time, all conflicts are resolved at the stage of merging into a release.

Answer 3

Just yesterday I found this model - demiazz.github.com/blog/2011/11/19/a-successfull-git-branching-model/ , it seems to me that it will suit you quite well.