Developer cost

Branching cost

$$$

$

~40 bytes

Poor branching strategy

$$$$

Everything on master

Last good state?

Mistakes break everyone

Leads to big commits

Everything on master

You're probably branching without realizing it.

Branch per release

What is deployed?

Where do fixes go?

Branch per release

Branch per developer

What is being worked on?

How do you switch tasks?

When do you integrate?

Branch per developer

MERGE HELL

It's not as scary as it looks.

Primary Branches

Development branch

Deployment branch

Feature branches

Secondary Branches

Release-prep branches

Hotfix branches

Support branches

Long-lived branches

development

production

Feature development

Feature development

$ git checkout -b feature/cart development

$ git commit

$ # rinse and repeat

$ git checkout development

$ git merge --no-ff feature/cart

$ # cleanup

$ git branch -d feature/cart

Feature development

git-flow-avh

Feature development

$ git flow feature start cart

$ git commit

$ # rinse and repeat

$ git flow feature finish cart

Feature development

Preparing a release

Preparing a release

Merge tag into development to keep git-describe awesomeness.

Preparing a release

$ git flow release start 4.2.2

$ vim package.json # update version in package file

$ git commit

$ git flow release finish 4.2.2

Preparing a release

$ git checkout -b rel/4.2.2 development

$ vim package.json # update version in package file

$ git commit

$ git checkout production

$ git merge --no-ff rel/4.2.2

$ git checkout development

$ git merge --no-ff 4.2.2

$ git tag -a 4.2.2

Quick, push a hotfix!

Quick, push a hotfix!

$ git flow hotfix start 4.2.3

$ git commit # fix bug

$ vim package.json && git commit # update version in package file

$ git flow hotfix finish 4.2.3

Quick, push a hotfix!

$ git checkout -b hotfix/4.2.3 production

$ git commit # fix bug

$ git commit # update version in package file

$ git checkout production

$ git merge --no-ff hotfix/4.2.3

$ git checkout development

$ git merge --no-ff 4.2.3

$ git tag -a 4.2.3

Support old versions :(

Support old versions :(

$ git flow support start 1.8.6 1.8.5

$ git commit # fix bug

$ git commit # fix more bugs

$ git tag -a 1.8.6 # tag if you want to, but don't merge it

Support old versions :(

$ git checkout -b support/1.8.6 1.8.5

$ git commit # fix bug

$ git commit # fix more bugs

$ git tag -a 1.8.6 # tag if you want to, but don't merge it