Slide 1

Slide 1 text

Git and GitHub Workflows  with Mahew McCullough

Slide 2

Slide 2 text

Mahew McCullough @mahewmccull @githubtraining

Slide 3

Slide 3 text

Git 1

Slide 4

Slide 4 text

No content

Slide 5

Slide 5 text

GitHub 2

Slide 6

Slide 6 text

WORLD’S LARGEST CODE-SHARING PLATFORM VC Investment $100 million Repositories 8.0 million  Users 4.8 million  Hubbernauts 200  Founded 2008 

Slide 7

Slide 7 text

Paerns 3

Slide 8

Slide 8 text

 Developer

Slide 9

Slide 9 text

 Maintainer

Slide 10

Slide 10 text

 Long-term support

Slide 11

Slide 11 text

Branches 4

Slide 12

Slide 12 text

 Primary-only

Slide 13

Slide 13 text

 master and feature

Slide 14

Slide 14 text

 master and feature and bug fix

Slide 15

Slide 15 text

 master and feature and bugfix

Slide 16

Slide 16 text

 master and stable and qa and integration and feature and bugfix

Slide 17

Slide 17 text

 git-flow

Slide 18

Slide 18 text

No content

Slide 19

Slide 19 text

 GitHub Flow

Slide 20

Slide 20 text

No content

Slide 21

Slide 21 text

No content

Slide 22

Slide 22 text

No content

Slide 23

Slide 23 text

Merges 5

Slide 24

Slide 24 text

 single feature delivery

Slide 25

Slide 25 text

 big-bang integration

Slide 26

Slide 26 text

History 6

Slide 27

Slide 27 text

 quality of code

Slide 28

Slide 28 text

 quality of history

Slide 29

Slide 29 text

 when history becomes permanent

Slide 30

Slide 30 text

 git commit --amend

Slide 31

Slide 31 text

 git rebase

Slide 32

Slide 32 text

 git rebase -i

Slide 33

Slide 33 text

CI 7

Slide 34

Slide 34 text

 status where it makes sense

Slide 35

Slide 35 text

No content

Slide 36

Slide 36 text

Git and GitHub Workflows  with Mahew McCullough

Slide 37

Slide 37 text

 training.github.com

Slide 38

Slide 38 text

@mahewmccull @githubtraining [email protected]