HackRU2013-GH - Speaker Deck

Slide 1

Slide 1 text

Git and GitHub Workflows for Fun and Profit

Slide 2

Slide 2 text

Brian Levine GitHub: @balevine Email: balevine@github.com Twitter: @Brian_A_Levine (but don't bother)

Slide 3

Slide 3 text

No content

Slide 4

Slide 4 text

version control is awesome

Slide 5

Slide 5 text

version control is awesome distributed even more ^ ^

Slide 6

Slide 6 text

git repository : all your code

Slide 7

Slide 7 text

git repository : all your code all of its history

Slide 8

Slide 8 text

git repository : all your code all of its history all collaborators

Slide 9

Slide 9 text

git repository : all your code all of its history all collaborators all the time

Slide 10

Slide 10 text

commit early commit often “git commit should be used as often as ctrl+s” - someone I once overheard

Slide 11

Slide 11 text

branching master

Slide 12

Slide 12 text

branching master cool-feature

Slide 13

Slide 13 text

branching and merging master cool-feature

Slide 14

Slide 14 text

branching and merging real life is messy

Slide 15

Slide 15 text

remotes https://github.com/balevine/impress.js URL specific

Slide 16

Slide 16 text

remotes git fetch git merge git pull fetch stuff

Slide 17

Slide 17 text

remotes git fetch git merge git pull fetch stuff git push push stuff and

Slide 18

Slide 18 text

No content

Slide 19

Slide 19 text

remote repositories GitHub gives you

Slide 20

Slide 20 text

remote repositories interface for git GitHub gives you

Slide 21

Slide 21 text

remote repositories interface for git forking GitHub gives you

Slide 22

Slide 22 text

remote repositories interface for git forking merging GitHub gives you

Slide 23

Slide 23 text

tools for sharing GitHub gives you

Slide 24

Slide 24 text

ideas / problems and solutions Issues Pull Requests and

Slide 25

Slide 25 text

bug tracking Issues

Slide 26

Slide 26 text

bug tracking feature requests Issues

Slide 27

Slide 27 text

bug tracking feature requests cool ideas Issues

Slide 28

Slide 28 text

ask someone to merge your changes into their repository or branch Pull Requests

Slide 29

Slide 29 text

just what it sounds like Pull Requests

Slide 30

Slide 30 text

just what it sounds like but more Pull Requests

Slide 31

Slide 31 text

code review Pull Requests

Slide 32

Slide 32 text

code discussion Pull Requests

Slide 33

Slide 33 text

let's talk about workflows

Slide 34

Slide 34 text

should be intuitive workflows

Slide 35

Slide 35 text

should be easy workflows

Slide 36

Slide 36 text

fork a repository Fork and Pull

Slide 37

Slide 37 text

fork a repository make a pull request Fork and Pull

Slide 38

Slide 38 text

here's how we roll master is stable

Slide 39

Slide 39 text

here's how we roll master is stable topic branches for everything

Slide 40

Slide 40 text

here's how we roll master is stable topic branches for everything commit locally

Slide 41

Slide 41 text

here's how we roll master is stable topic branches for everything commit locally push often

Slide 42

Slide 42 text

here's how we roll master is stable topic branches for everything commit locally push often pull request to discuss

Slide 43

Slide 43 text

here's how we roll master is stable topic branches for everything commit locally push often pull request to discuss merge to master when ready

Slide 44

Slide 44 text

all together now commit early and often

Slide 45

Slide 45 text

all together now commit early and often use branches wisely

Slide 46

Slide 46 text

all together now commit early and often use branches wisely use Issues for bugs and features

Slide 47

Slide 47 text

all together now commit early and often use branches wisely use Issues for bugs and features use Pull Requests for code

Slide 48

Slide 48 text

all together now commit early and often use branches wisely use Issues for bugs and features use Pull Requests for code find a workflow that's good for you

Slide 49

Slide 49 text

all together now commit early and often use branches wisely use Issues for bugs and features use Pull Requests for code find a workflow that's good for you (but we think ours rocks)

Slide 50

Slide 50 text

there's a whole world of good stuff out there teach.github.com training.github.com

Slide 51

Slide 51 text

stalk follow me for more info and fun pictures of my dogs or email me your questions @Brian_A_Levine balevine@github.com