svn
start from a straight line
git
accept reality
even if you work on master, it’s a branch of origin/master
How does your story look?
git-svn git-flow github
git-svn
the illusion of straight-line development
Local work is squashed or rebased onto master
or display reality
work that took place in parallel is recorded in parallel
Which branch is for working?
git-flow
Who decides when it’s ready?
github
choose the shape of your history
choose your level of reality
choose tightness of control
Your story is what you make it.