Simple Git flow which works

Having a great git workflow is very important because it is used by engineers every day. Having a complicated git flow can be very powerful for your product, but think of who ususese it every day.
If it is painful and time-consuming for your teammates this is not the best choice.

I will present to you a simple workflow I have experienced my self and who handles the life cycle of your product. This workflow is great for an inhouse or a SaaS product working with a Scrum Sprint philosophy.

If you have to manage a lot of versions of the same product in parallel, maybe the famous NVIE Gitflow is better for you (if you are selling on-premise products for example).

Simple Git Flow who works

TL;DR

The goal is to be easy for engineers and effective for product management. If you are doing proper releases on your product and if you maintaining only the last version.

We have 4 types of branches:

• features: Start from dev, this a work in progress feature, should be merged on dev
• dev: Next prod release, should be merge on master when version is ready.
• master: Current version in prod, each merge on this branch should be tag and deployed.
• hotfixes: Start from master, fix a problem who can not wait for the…