git init
develop
super
index.html
index.html
index.html dev
Ajout de features
Mise en place de nouvelles features
Merge branch 'feature/foo' into develop
bug h1
Bumped version number 1.2
Prod
Merge branch 'release/v1.2'

Conflicts:
	index.html
dev to prod
release in prod
page
test
Merge branch 'test' into release/v1.2
yop
jhojhg
Merge branch 'release/v1.2'

Conflicts:
	index.html
Release v1.3
jkhgf
Merge branch 'release/v1.3'

Conflicts:
	README
Hotfix