Welcome to the website of Davis Fiore

In a Version Control System, when you branch you are creating a new line of development from the main one. There are different strategies on how to do that, each with pros and cons.

Continuos deployment is the simplest model, because there is no branching at all.

• It doesn't suit large projects
• It doesn't accomplish isolation

Branch by feature or short lived feature is a model where each developer branch from master to develop its own feature, then merge back in a few days.

• It accomplishes a minimal isolation, but minimizes merge overhead

Trunk based development is like continuous deployment, except for the releases that branch out from master.

• This allows to maintain different versions

Mainline is a model where each team branch out from master, even for a considerable time.

• It works when there are multiple projects for the same code

Cascade is a model where the first release branch out from master and each following release branches out from the previous release branch.

• This allows to maintain different versions

GitFlow is a very popular Git branching model. It clearly separates code under development from code ready to be released, and hot fixes. All of them can run in parallel in different branches.

• It suits big projects and scale well
• It allows to tag each release, but it doesn't allow to maintain multiple versions at the same time

GitHub flow is like feature branching, but code is merged into master only via pull requests.

• It facilitates frequent releases