part 4 of git, illuminated

Wednesday, September 18, 13

Wednesday, September 18, 13

@jessitron

http://gitworkshop.jessitron.com

Wednesday, September 18, 13

Wednesday, September 18, 13

Git, Illuminated

workflows | ++

Wednesday, September 18, 13

svn

start from a straight line

Wednesday, September 18, 13

git

accept reality

even if you work on master, it’s a branch of origin/master

Wednesday, September 18, 13

How does your story look?

git-svn git-flow github

Wednesday, September 18, 13

git-svn

the illusion of straight-line development

Local work is squashed or rebased onto master

Wednesday, September 18, 13

or display reality

work that took place in parallel is recorded in parallel

Wednesday, September 18, 13

git-svn

rebase to bring in work

Wednesday, September 18, 13

git-svn

rebase to bring in work

Wednesday, September 18, 13

git-svn

rebase to bring in work

Wednesday, September 18, 13

or display reality

Wednesday, September 18, 13

or display reality

Wednesday, September 18, 13

or display reality

Wednesday, September 18, 13

Which branch is for working?

git-flow

Wednesday, September 18, 13

git-flow

master is for releases

v2.0

v2.1

Wednesday, September 18, 13

git-flow

master is for releases

v2.0

v2.1

Wednesday, September 18, 13

git-flow

develop is for progress

v2.0

v2.1

Wednesday, September 18, 13

git-flow

features are for work

v2.0

v2.1

feature/ponies

Wednesday, September 18, 13

git-flow

releases are for testing

v2.0

v2.1

Wednesday, September 18, 13

git-flow

releases are for testing

v2.0

v2.1

Wednesday, September 18, 13

git-flow

releases are for testing

v2.0

release/v2.1

Wednesday, September 18, 13

git-flow

releases are for testing

v2.0

release/v2.1

Wednesday, September 18, 13

git-flow

releases are for testing

v2.0

v2.1

Wednesday, September 18, 13

git-flow

hotfixes are for fixing

v2.0

v2.1

v2.0.1

Wednesday, September 18, 13

Who decides when it’s ready?

github

Wednesday, September 18, 13

github

author != committer

Wednesday, September 18, 13

github

author != committer

Wednesday, September 18, 13

github

author != committer

Wednesday, September 18, 13

github

author != committer

Wednesday, September 18, 13

github

fork

Wednesday, September 18, 13

github

fork

Wednesday, September 18, 13

github local

fork clone

Wednesday, September 18, 13

github local

Wednesday, September 18, 13

github local

Wednesday, September 18, 13

github local

push

Wednesday, September 18, 13

github local

push

Wednesday, September 18, 13

github local

push

Wednesday, September 18, 13

github local

push

Wednesday, September 18, 13

github local

pushpull request

Wednesday, September 18, 13

github local

Wednesday, September 18, 13

choose the shape of your history

choose your level of reality

choose tightness of control

Your story is what you make it.

Wednesday, September 18, 13

Wednesday, September 18, 13