part 4 of git, illuminated
DESCRIPTION
StrangeLoop 2013TRANSCRIPT
![Page 1: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/1.jpg)
Wednesday, September 18, 13
![Page 2: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/2.jpg)
Wednesday, September 18, 13
![Page 3: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/3.jpg)
@jessitron
http://gitworkshop.jessitron.com
Wednesday, September 18, 13
![Page 4: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/4.jpg)
Wednesday, September 18, 13
![Page 5: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/5.jpg)
Git, Illuminated
workflows | ++
Wednesday, September 18, 13
![Page 6: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/6.jpg)
svn
start from a straight line
Wednesday, September 18, 13
![Page 7: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/7.jpg)
git
accept reality
even if you work on master, it’s a branch of origin/master
Wednesday, September 18, 13
![Page 8: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/8.jpg)
How does your story look?
git-svn git-flow github
Wednesday, September 18, 13
![Page 9: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/9.jpg)
git-svn
the illusion of straight-line development
Local work is squashed or rebased onto master
Wednesday, September 18, 13
![Page 10: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/10.jpg)
or display reality
work that took place in parallel is recorded in parallel
Wednesday, September 18, 13
![Page 11: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/11.jpg)
git-svn
rebase to bring in work
Wednesday, September 18, 13
![Page 12: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/12.jpg)
git-svn
rebase to bring in work
Wednesday, September 18, 13
![Page 13: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/13.jpg)
git-svn
rebase to bring in work
Wednesday, September 18, 13
![Page 14: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/14.jpg)
or display reality
Wednesday, September 18, 13
![Page 15: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/15.jpg)
or display reality
Wednesday, September 18, 13
![Page 16: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/16.jpg)
or display reality
Wednesday, September 18, 13
![Page 17: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/17.jpg)
Which branch is for working?
git-flow
Wednesday, September 18, 13
![Page 18: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/18.jpg)
git-flow
master is for releases
v2.0
v2.1
Wednesday, September 18, 13
![Page 19: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/19.jpg)
git-flow
master is for releases
v2.0
v2.1
Wednesday, September 18, 13
![Page 20: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/20.jpg)
git-flow
develop is for progress
v2.0
v2.1
Wednesday, September 18, 13
![Page 21: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/21.jpg)
git-flow
features are for work
v2.0
v2.1
feature/ponies
Wednesday, September 18, 13
![Page 22: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/22.jpg)
git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13
![Page 23: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/23.jpg)
git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13
![Page 24: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/24.jpg)
git-flow
releases are for testing
v2.0
release/v2.1
Wednesday, September 18, 13
![Page 25: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/25.jpg)
git-flow
releases are for testing
v2.0
release/v2.1
Wednesday, September 18, 13
![Page 26: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/26.jpg)
git-flow
releases are for testing
v2.0
v2.1
Wednesday, September 18, 13
![Page 27: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/27.jpg)
git-flow
hotfixes are for fixing
v2.0
v2.1
v2.0.1
Wednesday, September 18, 13
![Page 28: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/28.jpg)
Who decides when it’s ready?
github
Wednesday, September 18, 13
![Page 29: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/29.jpg)
github
author != committer
Wednesday, September 18, 13
![Page 30: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/30.jpg)
github
author != committer
Wednesday, September 18, 13
![Page 31: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/31.jpg)
github
author != committer
Wednesday, September 18, 13
![Page 32: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/32.jpg)
github
author != committer
Wednesday, September 18, 13
![Page 33: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/33.jpg)
github
fork
Wednesday, September 18, 13
![Page 34: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/34.jpg)
github
fork
Wednesday, September 18, 13
![Page 35: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/35.jpg)
github local
fork clone
Wednesday, September 18, 13
![Page 36: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/36.jpg)
github local
Wednesday, September 18, 13
![Page 37: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/37.jpg)
github local
Wednesday, September 18, 13
![Page 38: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/38.jpg)
github local
push
Wednesday, September 18, 13
![Page 39: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/39.jpg)
github local
push
Wednesday, September 18, 13
![Page 40: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/40.jpg)
github local
push
Wednesday, September 18, 13
![Page 41: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/41.jpg)
github local
push
Wednesday, September 18, 13
![Page 42: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/42.jpg)
github local
pushpull request
Wednesday, September 18, 13
![Page 43: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/43.jpg)
github local
Wednesday, September 18, 13
![Page 44: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/44.jpg)
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
![Page 45: Part 4 of Git, Illuminated](https://reader035.vdocuments.us/reader035/viewer/2022062319/55527a7bb4c905115b8b49a7/html5/thumbnails/45.jpg)
Wednesday, September 18, 13