•

master

contains reviewed, tested, Production-ready code • Start a new release by creating a

release/a.b.c

branch from

master

• All feature/fix branches are cut from the corresponding relevant

release

branch • Code only gets merged back into its

release

after review and QA • Full UAT happens on

release

at any point as we know it contains reviewed, tested code. • Once the release is validated and ready, merge to

master

and publish it • Any urgent hot fixes or whatever else comes in outside the normal flow is done on a branch off

master

following the same review/testing rules, then merged down to all outstanding

release

and

feature

branches